From bb1a02c8bd48fca30b9b7b2462d03ebad010daa4 Mon Sep 17 00:00:00 2001 From: Charles Hacskaylo Date: Wed, 2 Sep 2015 18:02:58 -0700 Subject: [PATCH] [Frontend] Significant re-factoring of CSS and markup open #95 IN-PROGRESS!; Mostly buttons and menus classes (s-btn and s-menu); Removed unused templates and .css files; Normalized some button containers; --- platform/commonUI/browse/bundle.json | 6 - .../res/templates/create/create-button.html | 7 +- .../browse/res/templates/topbar-browse.html | 36 - .../commonUI/dialog/res/templates/dialog.html | 6 +- .../dialog/res/templates/overlay-options.html | 2 +- .../res/templates/edit-action-buttons.html | 2 +- .../general/res/css/theme-espresso.css | 5808 ++++++++--------- .../commonUI/general/res/sass/_autoflow.scss | 4 +- .../commonUI/general/res/sass/_constants.scss | 5 +- .../commonUI/general/res/sass/_icons.scss | 2 +- platform/commonUI/general/res/sass/_main.scss | 36 +- .../commonUI/general/res/sass/_mixins.scss | 34 +- .../general/res/sass/controls/_buttons.scss | 154 +- .../general/res/sass/controls/_controls.scss | 135 +- .../general/res/sass/controls/_menus.scss | 47 +- platform/commonUI/general/res/sass/forms.scss | 40 - platform/commonUI/general/res/sass/items.scss | 33 - .../general/res/sass/mobile/_layout.scss | 2 +- .../general/res/sass/overlay/_overlay.scss | 16 +- .../general/res/sass/theme-espresso.scss | 11 + .../res/sass/themes/_theme-espresso.scss | 8 +- .../general/res/sass/user-environ/_frame.scss | 4 +- .../res/sass/user-environ/_layout.scss | 22 +- .../res/templates/controls/action-button.html | 2 +- .../res/templates/controls/action-group.html | 13 +- .../res/templates/controls/switcher.html | 8 +- .../res/templates/menu/context-menu.html | 2 +- .../imagery/res/templates/imagery.html | 12 +- platform/features/layout/bundle.json | 2 +- .../features/plot/res/templates/plot.html | 11 +- .../forms/res/templates/controls/button.html | 2 +- .../forms/res/templates/controls/color.html | 6 +- .../res/templates/controls/menu-button.html | 8 +- platform/search/res/templates/search.html | 2 +- 34 files changed, 3022 insertions(+), 3466 deletions(-) delete mode 100644 platform/commonUI/browse/res/templates/topbar-browse.html delete mode 100644 platform/commonUI/general/res/sass/forms.scss delete mode 100644 platform/commonUI/general/res/sass/items.scss diff --git a/platform/commonUI/browse/bundle.json b/platform/commonUI/browse/bundle.json index c5ee5e7198..9b82d32d4a 100644 --- a/platform/commonUI/browse/bundle.json +++ b/platform/commonUI/browse/bundle.json @@ -45,12 +45,6 @@ "templateUrl": "templates/create/locator.html" } ], - "templates": [ - { - "key": "topbar-browse", - "templateUrl": "templates/topbar-browse.html" - } - ], "representations": [ { "key": "browse-object", diff --git a/platform/commonUI/browse/res/templates/create/create-button.html b/platform/commonUI/browse/res/templates/create/create-button.html index 527afd9882..67a0294111 100644 --- a/platform/commonUI/browse/res/templates/create/create-button.html +++ b/platform/commonUI/browse/res/templates/create/create-button.html @@ -20,10 +20,11 @@ at runtime from the About dialog for additional information. -->