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

..

controls

Merge remote-tracking branch 'github/master' into open233b

2015-11-04 09:28:19 -08:00

edit

[Frontend] Added top right resize corner

2015-06-30 09:27:56 -07:00

features

[Frontend] IN-PROGRESS Theming continues

2015-09-10 15:01:51 -07:00

forms

[Frontend] Time controller-related styling (CP > open117)

2015-09-25 13:57:43 -07:00

helpers

[Frontend] Safety merge of master; minor fixes

2015-10-30 17:09:04 -07:00

items

[Frontend] type-icon evolving to universal t-item-icon

2015-10-28 00:24:57 -07:00

lists

[Frontend] Time Controller Markup and Styling

2015-09-24 16:42:45 -07:00

mobile

Merge remote-tracking branch 'github/master' into open233b

2015-11-04 09:28:19 -08:00

overlay

Merge open155 > github/master

2015-10-30 16:20:57 -07:00

plots

[Frontend] Time Controller Markup and Styling

2015-09-24 10:34:32 -07:00

search

[Frontend] New .loading class

2015-10-19 11:13:50 -07:00

tree

[Frontend] Refinements to t-item-icon

2015-10-28 21:34:01 -07:00

user-environ

Merge remote-tracking branch 'github/master' into open233b

2015-11-04 09:28:19 -08:00

_about.scss

[Frontend] IN-PROGRESS Theming continues, sanding

2015-09-10 15:58:00 -07:00

_autoflow.scss

[Frontend] Significant re-factoring of CSS and markup

2015-09-02 18:02:58 -07:00

_badges.scss

[Frontend] Updated CSS; removed position: relative

2015-06-08 11:14:58 -07:00

_constants.scss

Merge remote-tracking branch 'github/master' into open233b

2015-11-04 09:28:19 -08:00

_data-status.scss

[Frontend] Updated CSS; removed position: relative

2015-06-08 11:14:58 -07:00

_effects.scss

[Frontend] IN-PROGRESS Theme changes continuing

2015-09-11 16:25:19 -07:00

_fixed-position.scss

[Frontend] IN-PROGRESS Theming continues

2015-09-10 15:01:51 -07:00

_global.scss

[Frontend] Tweaks to splitter-related SASS

2015-10-29 10:09:47 -07:00

_icons.scss

[Frontend] t-item-icon

2015-10-28 21:44:56 -07:00

_iframe.scss

[Licenses] Add license headers

2015-05-13 16:43:30 -07:00

_inspector.scss

[Frontend] Tweaked spacing in Inspector header

2015-11-02 13:39:15 -08:00

_limits.scss

Merging in latest github/master

2015-10-27 17:17:10 -07:00

_main.scss

Merge remote-tracking branch 'github/master' into open233b

2015-11-04 09:28:19 -08:00

_mixins.scss

Merge remote-tracking branch 'github/master' into open233b

2015-11-04 09:28:19 -08:00

_text.scss

[Frontend] IN-PROGRESS Theming continues, sanding

2015-09-10 15:58:00 -07:00

_views.scss

[Frontend] Time controller-related styling

2015-09-29 08:43:34 -07:00