Merge branch 'master' into nem468a.

Many tweaks to fix some issues with tree, labels and Inspector.

Conflicts:
	platform/commonUI/edit/res/templates/elements.html
	platform/commonUI/general/res/sass/search/_search.scss
	platform/commonUI/general/res/sass/tree/_tree.scss
	platform/commonUI/general/res/templates/object-inspector.html
	platform/commonUI/themes/espresso/res/css/theme-espresso.css
	platform/commonUI/themes/snow/res/css/theme-snow.css
	platform/search/res/templates/search.html
This commit is contained in:
Charles Hacskaylo
2016-01-11 13:29:26 -08:00
72 changed files with 4215 additions and 727 deletions

View File

@@ -302,6 +302,7 @@
.splitter-treeview,
.holder-treeview-elements {
opacity: 0;
pointer-events: none;
}
}
@@ -333,6 +334,7 @@
.l-inspect,
.splitter-inspect {
opacity: 0;
pointer-events: none;
}
}
}