Victor Woeltjen 50bd233b0a Merge remote-tracking branch 'origin/master' into table-export-934 ... Conflicts: platform/commonUI/general/res/sass/controls/_buttons.scss platform/features/table/res/templates/mct-table.html		2016-06-15 10:05:20 -07:00
..
controls	Merge remote-tracking branch 'origin/master' into table-export-934	2016-06-15 10:05:20 -07:00
edit	[Build] Switch compass to bourbon	2016-02-22 18:02:16 -08:00
features	[Frontend] Styling Export button	2016-05-31 11:40:31 -07:00
forms	[Frontend] Form styling	2016-03-21 11:13:43 -07:00
helpers	[Frontend] Refinements to .loading and related	2016-03-24 15:10:22 -07:00
items	[Frontend] Fixed HTML and CSS for grid-item	2016-01-15 15:33:10 -08:00
lists	[Frontend] Styling Export button	2016-05-31 11:40:31 -07:00
mobile	Merge branch 'master' into open639	2016-02-23 10:46:33 -08:00
overlay	[Frontend] Form styling	2016-03-21 11:13:43 -07:00
plots	[Build] Switch compass to bourbon	2016-02-22 18:02:16 -08:00
search	Merge branch 'master' into open639	2016-02-23 10:46:33 -08:00
tree	Merge branch 'master' into open639	2016-02-23 10:46:33 -08:00
user-environ	Merge remote-tracking branch 'origin/master' into table-export-934	2016-06-15 10:05:20 -07:00
_about.scss	[Frontend] Fix paths, includes	2016-02-26 14:49:34 -08:00
_archetypes.scss	[Frontend] Layout and styling of Time Conductor	2016-05-11 11:32:39 -07:00
_autoflow.scss	[Build] Switch compass to bourbon	2016-02-22 18:02:16 -08:00
_badges.scss	[Build] Switch compass to bourbon	2016-02-22 18:02:16 -08:00
_constants.scss	[Frontend] Added transitional animation to Edit mode	2016-06-01 19:18:55 -07:00
_data-status.scss	[Frontend] Updated CSS; removed position: relative	2015-06-08 11:14:58 -07:00
_effects.scss	[Frontend] Added transitional animation to Edit mode	2016-06-01 19:18:55 -07:00
_fixed-position.scss	[Build] Switch compass to bourbon	2016-02-22 18:02:16 -08:00
_global.scss	[Frontend] Layout and positioning fixes for TC controls	2016-05-09 17:56:50 -07:00
_icons.scss	[Build] Switch compass to bourbon	2016-02-22 18:02:16 -08:00
_iframe.scss	[Licenses] Add license headers	2015-05-13 16:43:30 -07:00
_inspector.scss	[Frontend] Cleanups to Inspector config elements	2016-03-10 13:18:57 -08:00
_limits.scss	Merging in latest github/master	2015-10-27 17:17:10 -07:00
_logo-and-bg.scss	[Frontend] Fix paths, includes	2016-02-26 14:49:34 -08:00
_main.scss	[Frontend] Further cleanups to form elements	2016-03-16 14:40:06 -07:00
_mixins.scss	[Frontend] Styling Export button	2016-05-31 11:40:31 -07:00
_object-label.scss	[Frontend] Refinements to .loading and related	2016-03-24 15:10:22 -07: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
openmct.scss	[Frontend] New logo art; paths changed	2016-02-26 10:15:15 -08:00
startup-base.scss	[Frontend] Fix for scrollbar flicker	2016-03-16 17:34:28 -07:00