Victor Woeltjen dbf196e014 Merge remote-tracking branch 'github/master' into open477 ... Resolve conflicts to complete merge of #477 Conflicts: platform/commonUI/general/bundle.json platform/commonUI/themes/espresso/res/css/theme-espresso.css platform/commonUI/themes/snow/res/css/theme-snow.css		2016-01-27 12:53:46 -08:00
..
controls	Merge branch 'master' into nem468a.	2016-01-11 13:29:26 -08:00
edit	[Frontend] Refactor to use s-status-editing instead of ng-class	2016-01-08 16:11:00 -08:00
features	Merged from master	2015-11-25 09:04:11 -08:00
forms	Merged from master	2016-01-14 15:16:02 -08:00
helpers	[Frontend] Fixes to CSS for Chrome Linux	2016-01-13 13:54:00 -08:00
items	[Frontend] Fixed HTML and CSS for grid-item	2016-01-15 15:33:10 -08:00
lists	[Frontend] Time Controller Markup and Styling	2015-09-24 16:42:45 -07:00
mobile	Merge branch 'master' into nem468a.	2016-01-11 13:29:26 -08:00
overlay	Merge open155 > github/master	2015-10-30 16:20:57 -07:00
plots	Merge remote-tracking branch 'github/master' into open477	2016-01-27 12:53:46 -08:00
search	[Frontend] Tree sanding and polishing	2015-12-17 10:49:39 -08:00
tree	Merge master into nem468a - picking up missed files	2016-01-11 13:30:56 -08:00
user-environ	[Frontend] Fixed z-index of .primary-pane	2016-01-11 15:19:23 -08:00
_about.scss	[Frontend] IN-PROGRESS Theming continues, sanding	2015-09-10 15:58:00 -07:00
_archetypes.scss	[Code style] Cleaned out comments	2015-11-10 15:12:09 -08:00
_autoflow.scss	[Frontend] Hiding filter input in autoflow element when in Layout	2015-12-17 14:11:39 -08:00
_badges.scss	[Frontend] Updated CSS; removed position: relative	2015-06-08 11:14:58 -07:00
_constants.scss	[Frontend] Added s-status-pending spinner to tree-item	2015-12-16 16:06:31 -08:00
_data-status.scss	[Frontend] Updated CSS; removed position: relative	2015-06-08 11:14:58 -07:00
_effects.scss	Merge branch 'master' into nem468a.	2016-01-11 13:29:26 -08:00
_fixed-position.scss	[Frontend] IN-PROGRESS Theming continues	2015-09-10 15:01:51 -07:00
_global.scss	[Frontend] Misc CSS updates to clean up layout	2015-11-10 17:14:12 -08:00
_icons.scss	[Frontend] Fixed HTML and CSS for grid-item	2016-01-15 15:33:10 -08:00
_iframe.scss	[Licenses] Add license headers	2015-05-13 16:43:30 -07:00
_inspector.scss	Merge master into nem468a - picking up missed files	2016-01-11 13:30:56 -08:00
_limits.scss	Merging in latest github/master	2015-10-27 17:17:10 -07:00
_main.scss	[Frontend] More sanding on label flex-box conversion	2015-12-16 17:32:43 -08:00
_mixins.scss	Merge branch 'master' into nem468a.	2016-01-11 13:29:26 -08:00
_object-label.scss	[Frontend] Fixes to CSS for Chrome Linux	2016-01-13 13:54:00 -08:00
_text.scss	[Frontend] IN-PROGRESS Theming continues, sanding	2015-09-10 15:58:00 -07:00
_views.scss	[Frontend] Time controller-related styling	2015-09-29 08:43:34 -07:00