Charles Hacskaylo 4f7ca98b60 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		2016-01-11 13:29:26 -08:00
..
containers	[Common UI] Remove obsolete split-pane container	2016-01-04 11:34:24 -08:00
controls	Merged from Master	2015-12-07 20:42:09 -08:00
menu	[Frontend] Significant re-factoring of CSS and markup	2015-09-02 18:02:58 -07:00
bottombar.html	Merge open155 > github/master	2015-10-30 16:20:57 -07:00
indicator.html	[Frontend] Added classes for no-collapse indicator	2015-12-11 15:49:50 -08:00
label.html	[Frontend] Final sanding on label flex-box conversion	2015-12-16 16:49:16 -08:00
message-banner.html	Merge open155 > github/master	2015-10-30 16:20:57 -07:00
object-inspector.html	[Frontend] Refactor Inspector to use s-status-editing	2016-01-08 16:47:11 -08:00
progress-bar.html	Merge open155 > github/master	2015-10-30 16:20:57 -07:00
subtree.html	[Mobile] Collapse tree on click	2015-09-21 10:53:45 -07:00
tree-node.html	Merge branch 'master' into nem468a.	2016-01-11 13:29:26 -08:00
tree.html	[Mobile] Collapse tree on click	2015-09-21 10:53:45 -07:00