Resolving conflict in platform/.../theme-espresso.css

#75 Merged in master branch; Re-rendered platform/.../theme-espresso.css;
2015-08-19 16:22:21 -07:00
parent 08d68f99a5 9c578c53db
commit 02abbdf4fe
23 changed files with 505 additions and 94 deletions
--- a/platform/commonUI/general/res/css/theme-espresso.css
+++ b/platform/commonUI/general/res/css/theme-espresso.css
@@ -2566,7 +2566,7 @@ label.checkbox.custom {
        box-sizing: border-box;
        border-top: 1px solid #737373;
        color: #d9d9d9;
-        line-height: 1.4rem;
+        line-height: 1.5rem;
        padding: 3px 10px 3px 30px;
        white-space: nowrap; }
        /* line 46, ../sass/controls/_menus.scss */
--- a/platform/commonUI/general/res/css/tree.css
+++ b/platform/commonUI/general/res/css/tree.css
@@ -124,8 +124,8 @@ ul.tree {
      transition: background-color 0.25s;
      display: block;
      font-size: 0.8em;
-      height: 1.4rem;
-      line-height: 1.4rem;
+      height: 1.5rem;
+      line-height: 1.5rem;
      margin-bottom: 3px;
      position: relative; }
      /* line 39, ../sass/tree/_tree.scss */