ExternalVendorCode/openmct
1
0
Fork 0
mirror of https://github.com/nasa/openmct.git synced 2024-12-22 22:42:24 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
4f7ca98b60
openmct/platform/commonUI/general/res
History
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
..
css [Frontend] IN-PROGRESS Major restructuring of /platform/commonUI/ to add themes structure 2015-09-03 15:34:39 -07:00
fonts/symbols [Frontend] Integrating new Inspect icon from prod-uisymbols 2015-11-04 14:29:21 -08:00
images Merge branch 'open-master' into open737 2015-01-27 16:40:32 -08:00
sass Merge branch 'master' into nem468a. 2016-01-11 13:29:26 -08:00
templates Merge branch 'master' into nem468a. 2016-01-11 13:29:26 -08:00
config.rb [Frontend] IN-PROGRESS Major restructuring of /platform/commonUI/ to add themes structure 2015-09-03 15:34:39 -07:00