Victor Woeltjen ab01f64cea Merge remote-tracking branch 'github/master' into open236 ... Resolve CSS conflicts for nasa/openmctweb#236 Conflicts: platform/commonUI/general/res/sass/controls/_controls.scss platform/commonUI/themes/espresso/res/css/theme-espresso.css platform/commonUI/themes/snow/res/css/theme-snow.css		2015-11-04 13:02:17 -08:00
..
_breadcrumb.scss	[Frontend] Renew of ue-frontend	2015-06-02 16:12:19 -07:00
_buttons.scss	[Frontend] Tweaks in Inspector	2015-10-30 23:44:15 -07:00
_color-palette.scss	[Licenses] Add license headers	2015-05-13 16:43:30 -07:00
_controls.scss	Merge remote-tracking branch 'github/master' into open236	2015-11-04 13:02:17 -08:00
_lists.scss	[Frontend] type-icon evolving to universal t-item-icon	2015-10-28 00:24:57 -07:00
_menus.scss	[Frontend] Fixed color of menu-item divider items;	2015-10-29 10:10:06 -07:00
_messages.scss	Merge open155 > github/master	2015-10-30 16:20:57 -07:00
_ticks.scss	[Licenses] Add license headers	2015-05-13 16:43:30 -07:00
_time-controller.scss	[Frontend] Polishing of styles for time-controller	2015-10-14 10:25:05 -07:00