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
..
controls	[Frontend] Fixed Create menu in mobile	2015-11-09 17:14:59 -08:00
overlay	Merge open155 > github/master	2015-10-30 16:20:57 -07:00
search	[Frontend] Mobile sanding and polishing	2015-12-17 10:21:06 -08:00
_constants.scss	[Frontend] Converting tree items and labels to flex-box	2015-12-16 13:26:30 -08:00
_item.scss	[Frontend] type-icon evolving to universal t-item-icon	2015-10-28 00:24:57 -07:00
_layout.scss	[Frontend] Merge work in open279 into open199	2015-11-16 15:20:43 -08:00
_mixins.scss	Merged from master	2015-11-25 09:04:11 -08:00
_tree.scss	[Frontend] Mobile sanding and polishing	2015-12-17 10:21:06 -08:00