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

..

_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 open233b

2015-11-04 09:28:19 -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