openmct/platform/commonUI/general/res/sass/controls
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
..
_breadcrumb.scss [Frontend] Renew of ue-frontend 2015-06-02 16:12:19 -07:00
_buttons.scss Merged from master 2015-11-25 09:04:11 -08:00
_color-palette.scss [Licenses] Add license headers 2015-05-13 16:43:30 -07:00
_controls.scss Merged from master 2015-11-25 09:04:11 -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 [Frontend] Added classes for no-collapse indicator 2015-12-11 15:49:50 -08:00
_ticks.scss [Licenses] Add license headers 2015-05-13 16:43:30 -07:00
_time-controller.scss [Frontend] Fixed plot display 2015-11-12 09:06:17 -08:00