ExternalVendorCode/openmct
1
0
Fork 0
mirror of https://github.com/nasa/openmct.git synced 2024-12-30 18:06:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
e32eb11e60
openmct/platform/commonUI/themes/snow/res
History
Victor Woeltjen f7839b758d Merge remote-tracking branch 'github/master' into open233b 
Resolve conflicts on nasa/openmctweb#233

Conflicts:
	platform/commonUI/general/bundle.json
	platform/commonUI/general/res/fonts/symbols/icomoon.io-WTD-symbols-project.json
	platform/commonUI/general/res/fonts/symbols/wtdsymbols.eot
	platform/commonUI/general/res/fonts/symbols/wtdsymbols.svg
	platform/commonUI/general/res/fonts/symbols/wtdsymbols.ttf
	platform/commonUI/general/res/fonts/symbols/wtdsymbols.woff
	platform/commonUI/general/res/sass/_main.scss
	platform/commonUI/general/res/sass/user-environ/_layout.scss
	platform/commonUI/themes/espresso/res/css/theme-espresso.css
	platform/commonUI/themes/espresso/res/sass/_constants.scss
	platform/commonUI/themes/snow/res/css/theme-snow.css
2015-11-04 09:28:19 -08:00
..
css Merge remote-tracking branch 'github/master' into open233b 2015-11-04 09:28:19 -08:00
sass Merge remote-tracking branch 'github/master' into open233b 2015-11-04 09:28:19 -08:00
config.rb [Frontend] IN-PROGRESS Major restructuring of /platform/commonUI/ to add themes structure 2015-09-03 15:34:39 -07:00