Charles Hacskaylo 2677dcd10c Merge branch 'open-master' into open1295 ...

Conflicts:
	platform/commonUI/general/res/css/theme-espresso.css
	platform/commonUI/general/res/sass/_main.scss

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

..

controls

[Frontend] Very minor tweaks to bring open into parity with lastest scss from ue-frontend

2015-06-15 17:43:52 -07:00

edit

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

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

features

[Merge] Cherrypick 2 from warp1220

2015-06-15 15:45:40 -07:00

forms

[Frontend] Markup and CSS for Time Controller

2015-06-02 19:29:57 -07:00

helpers

[Merge] Cherrypick 1 from warp1220

2015-06-15 15:44:09 -07:00

items

[Fronted] Significant refactoring of mixins for containers and buttons

2015-06-12 10:00:51 -07:00

lists

Merge branch 'open-master' into ue-frontend

2015-06-02 18:26:49 -07:00

overlay

[Licenses] Add license headers

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

plots

Merge branch 'open-master' into ue-frontend

2015-06-02 18:25:26 -07:00

themes

[Licenses] Add license headers

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

tree

[Merge] Cherrypick 1 from warp1220

2015-06-15 15:44:09 -07:00

user-environ

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

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

_about.scss

[Licenses] Add license headers

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

_autoflow.scss

Merge branch 'open-master' into ue-frontend

2015-06-02 18:25:26 -07:00

_badges.scss

Merge branch 'open-master' into ue-frontend

2015-06-02 18:25:26 -07:00

_constants.scss

[Merge] Merging open-master in; resolved conflicts

2015-06-15 16:47:23 -07:00

_data-status.scss

[Frontend] Renew of ue-frontend

2015-06-02 16:12:19 -07:00

_effects.scss

[Merge] Cherrypick 1 from warp1220

2015-06-15 15:44:09 -07:00

_fixed-position.scss

Merge branch 'open-master' into ue-frontend

2015-06-02 18:25:26 -07:00

_fonts.scss

[Licenses] Add license headers

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

_global.scss

[Merge] Cherrypick 1 from warp1220

2015-06-15 15:44:09 -07:00

_hide-non-functional.scss

[Fronted] Minor final sanding and polishing

2015-06-12 14:17:19 -07:00

_icons.scss

[Fronted] Significant refactoring of mixins for containers and buttons

2015-06-12 11:44:09 -07:00

_iframe.scss

[Licenses] Add license headers

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

_limits.scss

[Frontend] Renew of ue-frontend

2015-06-02 16:12:19 -07:00

_main.scss

Merge branch 'open-master' into open1295

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

_mixins.scss

[Merge] Cherrypick 2 from warp1220

2015-06-15 15:45:40 -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