Charles Hacskaylo 753bd97c8a Merge remote-tracking branch 'origin/master' into open933-c ...

# Conflicts:
#	platform/commonUI/edit/res/templates/create/create-menu.html
#	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/_archetypes.scss
#	platform/commonUI/general/res/sass/_constants.scss
#	platform/commonUI/general/res/sass/_icons.scss
#	platform/commonUI/general/res/sass/_main.scss
#	platform/commonUI/general/res/sass/_mixins.scss
#	platform/commonUI/general/res/sass/controls/_buttons.scss
#	platform/commonUI/general/res/templates/controls/time-controller.html
#	platform/commonUI/themes/snow/res/sass/_constants.scss

2016-08-01 17:12:44 -07:00

..

controls

Merge remote-tracking branch 'origin/master' into open933-c

2016-08-01 17:11:37 -07:00

edit

[Documentation] Updated copyright statement. Fixes #1081

2016-07-12 16:55:57 -07:00

features

Merge remote-tracking branch 'origin/master' into open933-c

2016-08-01 17:11:37 -07:00

forms

[Frontend] Refactor glyphs to classes

2016-08-01 14:33:25 -07:00

helpers

Merge remote-tracking branch 'origin/master' into open933-c

2016-08-01 17:11:37 -07:00

items

[Frontend] Refactor glyphs to classes

2016-08-01 14:33:25 -07:00

lists

[Frontend] Refactor glyphs to classes

2016-08-01 14:33:25 -07:00

mobile

[Frontend] Refactor glyphs to classes

2016-08-01 14:33:25 -07:00

overlay

[Frontend] Refactor glyphs to classes

2016-08-01 14:33:25 -07:00

plots

[Documentation] Updated copyright statement. Fixes #1081

2016-07-12 16:55:57 -07:00

search

[Frontend] Refactor glyphs to classes

2016-08-01 14:33:25 -07:00

tree

[Frontend] Refactor glyphs to classes

2016-08-01 14:33:25 -07:00

user-environ

Merge remote-tracking branch 'origin/master' into open933-c

2016-08-01 17:11:37 -07:00

_about.scss

[Frontend] Refactor glyphs to classes

2016-08-01 14:33:25 -07:00

_animations.scss

[Frontend] Styling for Time Conductor v2

2016-07-14 16:39:27 -07:00

_archetypes.scss

Merge remote-tracking branch 'origin/master' into open933-c

2016-08-01 17:11:37 -07:00

_autoflow.scss

[Frontend] Refactor glyphs to classes

2016-08-01 14:33:25 -07:00

_badges.scss

[Documentation] Updated copyright statement. Fixes #1081

2016-07-12 16:55:57 -07:00

_constants.scss

Merge remote-tracking branch 'origin/master' into open933-c

2016-08-01 17:11:37 -07:00

_data-status.scss

[Frontend] Styling TC unsynced elements

2016-08-01 16:30:51 -07:00

_effects.scss

Merge remote-tracking branch 'origin/master' into open933-c

2016-08-01 17:11:37 -07:00

_fixed-position.scss

[Documentation] Updated copyright statement. Fixes #1081

2016-07-12 16:55:57 -07:00

_global.scss

Merge remote-tracking branch 'origin/master' into open933-c

2016-08-01 17:11:37 -07:00

_glyphs.scss

[Frontend] Refactor glyphs to classes

2016-08-01 14:33:25 -07:00

_icons.scss

Merge remote-tracking branch 'origin/master' into open933-c

2016-08-01 17:12:44 -07:00

_iframe.scss

[Documentation] Updated copyright statement. Fixes #1081

2016-07-12 16:55:57 -07:00

_inspector.scss

[Frontend] Refactor glyphs to classes

2016-08-01 14:33:25 -07:00

_limits.scss

[Frontend] Refactor glyphs to classes

2016-08-01 14:33:25 -07:00

_logo-and-bg.scss

[Documentation] Updated copyright statement. Fixes #1081

2016-07-12 16:55:57 -07:00

_main.scss

Merge remote-tracking branch 'origin/master' into open933-c

2016-08-01 17:11:37 -07:00

_mixins.scss

Merge remote-tracking branch 'origin/master' into open933-c

2016-08-01 17:11:37 -07:00

_object-label.scss

[Frontend] Refactor glyphs to classes

2016-08-01 14:33:25 -07:00

_text.scss

[Documentation] Updated copyright statement. Fixes #1081

2016-07-12 16:55:57 -07:00

_views.scss

[Frontend] Time controller-related styling

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

openmct.scss

[Documentation] Updated copyright statement. Fixes #1081

2016-07-12 16:55:57 -07:00

startup-base.scss

[Documentation] Updated copyright statement. Fixes #1081

2016-07-12 16:55:57 -07:00