Merge branch 'master' into open639

2016-02-23 10:46:33 -08:00
parent 626cc502fb f379db55e7
commit 77a2e0a70b
68 changed files with 340 additions and 17567 deletions
--- a/platform/commonUI/general/res/sass/tree/_tree.scss
+++ b/platform/commonUI/general/res/sass/tree/_tree.scss
@@ -35,9 +35,9 @@ ul.tree {
 .tree-item,
 .search-result-item {
    @extend .l-flex-row;
-	@include box-sizing(border-box);
-	@include border-radius($basicCr);
-	@include single-transition(background-color, 0.25s);
+	box-sizing: border-box;
+	border-radius: $basicCr;
+	@include transition(background-color, 0.25s);
 	font-size: 0.8rem;
 	height: $menuLineH;
 	line-height: $menuLineH;
@@ -158,7 +158,7 @@ mct-representation {
            .t-item-icon,
            .t-title-label {
                color: $colorItemTreeEditingFg;
-                @include text-shadow(none);
+                text-shadow: none;
            }
            .t-title-label {
                font-style: italic;