Merge master into nem468a - picking up missed files

2016-01-11 13:30:56 -08:00
parent 4f7ca98b60
commit acb2a2da12
5 changed files with 1314 additions and 744 deletions
--- a/platform/commonUI/general/res/sass/_inspector.scss
+++ b/platform/commonUI/general/res/sass/_inspector.scss
@@ -137,14 +137,8 @@
            .tree-item {
                .t-object-label {
                    // Elements pool is a flat list, so don't indent items.
+                    font-size: 0.75rem;
                    left: 0;
-                    .t-item-icon {
-                        font-size: 1em;
-                        width: 1em;
-                    }
-                    .t-title-label {
-                        left: 20px + $interiorMargin;
-                    }
                }
            }
        }