Merge branch 'master' into open638_rebase

2016-02-23 10:56:13 -08:00
parent 7d0de68db9 77a2e0a70b
commit fcdf89a4ee
155 changed files with 2018 additions and 52049 deletions
--- a/platform/commonUI/general/res/sass/_inspector.scss
+++ b/platform/commonUI/general/res/sass/_inspector.scss
@@ -58,9 +58,8 @@
            }
        }
    }
-
    .l-inspector-part {
-        @include box-sizing(border-box);
+        box-sizing: border-box;
        padding-right: $interiorMargin;
        .form {
            margin-left: $treeVCW + $interiorMarginLg;
@@ -90,7 +89,7 @@
    }

    em.t-inspector-part-header {
-        @include border-radius($basicCr);
+        border-radius: $basicCr;
        background-color: $colorInspectorSectionHeaderBg;
        color: $colorInspectorSectionHeaderFg;
        margin-bottom: $interiorMargin;
@@ -116,7 +115,7 @@
    .inspector-location {
        .location-item {
            $h: 1.2em;
-            @include box-sizing(border-box);
+            box-sizing: border-box;
            cursor: pointer;
            display: inline-block;
            line-height: $h;