Charles Hacskaylo 6868bfd4e1 [Merge] Resolve conflicts in open155 ...

open #155

Conflicts:
	platform/commonUI/general/res/sass/user-environ/_layout.scss
	platform/commonUI/themes/espresso/res/css/theme-espresso.css
	platform/commonUI/themes/snow/res/css/theme-snow.css
	platform/commonUI/themes/snow/res/sass/_constants.scss

2015-10-26 13:20:26 -07:00

..

controls

[Merge] Resolve conflicts in open155

2015-10-26 13:20:26 -07: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

[Merge] Resolve conflicts in open155

2015-10-26 13:20:26 -07:00

helpers

[Merge] Resolve conflicts in open155

2015-10-26 13:20:26 -07:00

items

[Frontend] IN-PROGRESS Theme changes continuing

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

lists

[Merge] Resolve conflicts in open155

2015-10-26 13:20:26 -07:00

mobile

[Frontend] Sanding/positioning and Cancel button added to Messasges dialog

2015-10-08 19:10:26 -07:00

overlay

[Frontend] Sanding/positioning and Cancel button added to Messasges dialog

2015-10-08 19:10:26 -07:00

plots

[Merge] Resolve conflicts in open155

2015-10-26 13:20:26 -07:00

search

[Merge] Resolve conflicts in open155

2015-10-26 13:20:26 -07:00

tree

[Merge] Resolve conflicts in open155

2015-10-26 13:20:26 -07:00

user-environ

[Merge] Resolve conflicts in open155

2015-10-26 13:20:26 -07: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] Resolve conflicts in open155

2015-10-26 13:20:26 -07: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

[Merge] Resolve conflicts in open155

2015-10-26 13:20:26 -07:00

_hide-non-functional.scss

[Frontend] Moved browse mode splitter settings to CSS file

2015-06-30 10:37:19 -07:00

_icons.scss

[Merge] Resolve conflicts in open155

2015-10-26 13:20:26 -07:00

_iframe.scss

[Licenses] Add license headers

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

_limits.scss

[Frontend] IN-PROGRESS Theme changes continuing

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

_main.scss

[Frontend] Progress bar/ message banner markup and styling

2015-10-06 14:34:53 -07:00

_mixins.scss

[Merge] Resolve conflicts in open155

2015-10-26 13:20:26 -07:00

_properties.scss

[Licenses] Add license headers

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

_text.scss

[Frontend] IN-PROGRESS Theming continues, sanding

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

_views.scss

[Merge] Resolve conflicts in open155

2015-10-26 13:20:26 -07:00