ExternalVendorCode/openmct
1
0
Fork 0
mirror of https://github.com/nasa/openmct.git synced 2025-01-22 20:38:23 +00:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity
a356e01b14
openmct/platform/commonUI/general/res/sass/user-environ
History
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
..
_frame.scss [Frontend] Time Controller Markup and Styling 2015-09-24 15:38:52 -07:00
_layout.scss Merge remote-tracking branch 'github/master' into open236 2015-11-04 13:02:17 -08:00
_tool-bar.scss Merge branch 'open-master' into ue-frontend 2015-06-02 18:25:26 -07:00
_top-bar.scss [Frontend] IN-PROGRESS Theme changes continuing 2015-09-09 15:55:12 -07:00