Victor Woeltjen 970698c77b Merge remote-tracking branch 'nasa/open1392' into open1392b ...

Conflicts:
	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

2015-06-29 16:09:01 -07:00

..

controls

[Frontend] Create menu style normalized

2015-06-26 18:38:33 -07:00

edit

[Frontend] Mods to layout element drag handles and editing behavior

2015-06-16 12:40:48 -07:00

features

[Frontend] platform-specific changes to CSS, fonts and markup

2015-06-29 14:39:46 -07:00

forms

[Frontend] New symbols font and CSS adjustments

2015-06-24 11:42:29 -07:00

helpers

Merge remote-tracking branch 'nasa/open1323' into open1324

2015-06-25 09:25:42 -07:00

items

[Frontend] New symbols font and CSS adjustments, in-progress

2015-06-23 16:07:29 -07:00

lists

Merge remote-tracking branch 'origin/open1223' into open-1338

2015-06-29 12:08:16 -07:00

overlay

[Frontend] Create menu style normalized

2015-06-26 18:38:33 -07:00

plots

[Frontend] Updated CSS; removed position: relative

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

themes

[Frontend] Bottom bar restyled

2015-06-26 17:12:24 -07:00

tree

[Frontend] New symbols font and CSS adjustments, in-progress

2015-06-23 16:07:29 -07:00

user-environ

[Frontend] Bottom bar restyled

2015-06-26 17:12:24 -07:00

_about.scss

[Licenses] Add license headers

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

_autoflow.scss

Merge remote-tracking branch 'nasa/open1341' into open1345

2015-06-25 10:06:18 -07:00

_badges.scss

[Frontend] Updated CSS; removed position: relative

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

_constants.scss

[Frontend] Create menu style normalized

2015-06-26 18:38:33 -07:00

_data-status.scss

[Frontend] Updated CSS; removed position: relative

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

_effects.scss

[Dev/Frontend] PLATFORM CHANGES: use data-value instead of css class selection

2015-06-25 11:46:15 -07:00

_fixed-position.scss

[Dev/Frontend] Cherry-picking platform changes from warp1341

2015-06-24 18:55:15 -07:00

_fonts.scss

[Licenses] Add license headers

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

_global.scss

[Frontend] Bottom bar restyled

2015-06-26 17:12:24 -07:00

_hide-non-functional.scss

[Frontend] Bottom bar restyled

2015-06-26 17:12:24 -07:00

_icons.scss

[Frontend] New symbols font and CSS adjustments, in-progress

2015-06-23 16:07:29 -07:00

_iframe.scss

[Licenses] Add license headers

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

_limits.scss

[Frontend] Updated CSS; removed position: relative

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

_main.scss

Merge branch 'open-master' into open1295

2015-06-17 11:00:53 -07:00

_mixins.scss

[Dev/Frontend] PLATFORM CHANGES: use data-value instead of css class selection

2015-06-25 11:46:15 -07:00

_properties.scss

[Licenses] Add license headers

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

_text.scss

[Licenses] Add license headers

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

forms.scss

[Licenses] Add license headers

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

items.scss

[Licenses] Add license headers

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

theme-espresso.scss

[Licenses] Add license headers

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

tree.scss

[Licenses] Add license headers

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