From 26b30d96db5ea52cefdad83766dbb8681559ca0f Mon Sep 17 00:00:00 2001 From: Charles Hacskaylo Date: Tue, 28 Jun 2016 17:16:18 -0700 Subject: [PATCH] [Frontend] Refactoring glyphs to classes Fixes #1047 In-progress; overlay close, search inputs, messages and message banners, ui-symbol removal in-progress. --- .../commonUI/browse/res/templates/back-arrow.html | 2 +- .../browse/res/templates/browse/object-header.html | 2 +- .../dialog/res/templates/overlay-message-list.html | 3 ++- .../commonUI/dialog/res/templates/overlay.html | 2 +- .../edit/res/templates/create/create-menu.html | 2 +- platform/commonUI/general/res/sass/_icons.scss | 14 -------------- .../general/res/sass/controls/_messages.scss | 10 ++++------ .../commonUI/general/res/sass/forms/_filter.scss | 7 ------- .../general/res/sass/overlay/_overlay.scss | 2 +- .../commonUI/general/res/sass/search/_search.scss | 8 +------- .../res/templates/controls/input-filter.html | 2 +- .../res/templates/controls/time-controller.html | 2 +- .../general/res/templates/message-banner.html | 3 +-- platform/search/res/templates/search.html | 4 ++-- 14 files changed, 17 insertions(+), 46 deletions(-) diff --git a/platform/commonUI/browse/res/templates/back-arrow.html b/platform/commonUI/browse/res/templates/back-arrow.html index 276a716089..57b1e5ae6d 100644 --- a/platform/commonUI/browse/res/templates/back-arrow.html +++ b/platform/commonUI/browse/res/templates/back-arrow.html @@ -20,7 +20,7 @@ at runtime from the About dialog for additional information. --> - diff --git a/platform/commonUI/browse/res/templates/browse/object-header.html b/platform/commonUI/browse/res/templates/browse/object-header.html index 6f10141434..85afc5bf17 100644 --- a/platform/commonUI/browse/res/templates/browse/object-header.html +++ b/platform/commonUI/browse/res/templates/browse/object-header.html @@ -19,7 +19,7 @@ this source code distribution or the Licensing information page available at runtime from the About dialog for additional information. --> - + {{parameters.mode}} {{model.name}} diff --git a/platform/commonUI/dialog/res/templates/overlay-message-list.html b/platform/commonUI/dialog/res/templates/overlay-message-list.html index 5a7a48192f..9a795c115e 100644 --- a/platform/commonUI/dialog/res/templates/overlay-message-list.html +++ b/platform/commonUI/dialog/res/templates/overlay-message-list.html @@ -2,7 +2,8 @@
{{ngModel.dialog.title}}
-
Displaying {{ngModel.dialog.messages.length}} messages +
Displaying {{ngModel.dialog.messages.length}} messages
diff --git a/platform/commonUI/dialog/res/templates/overlay.html b/platform/commonUI/dialog/res/templates/overlay.html index bc19a97b86..c85fb4e877 100644 --- a/platform/commonUI/dialog/res/templates/overlay.html +++ b/platform/commonUI/dialog/res/templates/overlay.html @@ -24,7 +24,7 @@
x + class="close icon-x">
\ No newline at end of file diff --git a/platform/commonUI/edit/res/templates/create/create-menu.html b/platform/commonUI/edit/res/templates/create/create-menu.html index 8b642eb8b2..8276493e28 100644 --- a/platform/commonUI/edit/res/templates/create/create-menu.html +++ b/platform/commonUI/edit/res/templates/create/create-menu.html @@ -32,7 +32,7 @@
-
+
{{representation.activeMetadata.name}}
diff --git a/platform/commonUI/general/res/sass/_icons.scss b/platform/commonUI/general/res/sass/_icons.scss index d2fced2e4e..93c48c868c 100644 --- a/platform/commonUI/general/res/sass/_icons.scss +++ b/platform/commonUI/general/res/sass/_icons.scss @@ -30,12 +30,6 @@ .ui-symbol { font-family: 'symbolsfont'; - &.type-icon { - color: $colorObjHdrIc; - } - &.icon-calendar:after { - content: "\e605"; - } } .ui-symbol.icon { @@ -69,14 +63,6 @@ position: absolute; } -.l-icon-alert { - display: none !important; - &:before { - color: $colorAlert; - content: "!"; - } -} - .t-item-icon { // Used in grid-item.html, tree-item, inspector location @extend .ui-symbol; diff --git a/platform/commonUI/general/res/sass/controls/_messages.scss b/platform/commonUI/general/res/sass/controls/_messages.scss index 2268fe42e5..c5bfa49b6a 100644 --- a/platform/commonUI/general/res/sass/controls/_messages.scss +++ b/platform/commonUI/general/res/sass/controls/_messages.scss @@ -233,7 +233,7 @@ @mixin messageBlock($iconW: 32px) { .type-icon.message-type { @include txtShdw($shdwStatusIc); - &:before { content:"\e920"; } + @extend .icon-bell; color: $colorStatusDefault; font-size: $iconW; padding: 1px; @@ -241,15 +241,15 @@ } .message-severity-info .type-icon.message-type { - &:before { content:"\e920"; } + @extend .icon-info; color: $colorStatusInfo; } .message-severity-alert .type-icon.message-type { - &:before { content:"\e911"; } + @extend .icon-bell; color: $colorStatusAlert; } .message-severity-error .type-icon.message-type { - &:before { content:"\e900"; } + @extend .icon-alert-rect; color: $colorStatusError; } } @@ -272,12 +272,10 @@ @include flex-direction(row); @include align-items(stretch); .type-icon.message-type { - //@include test(red); @include flex(0 1 auto); position: relative; } .message-contents { - //@include test(blue); @include flex(1 1 auto); margin-left: $overlayMargin; position: relative; diff --git a/platform/commonUI/general/res/sass/forms/_filter.scss b/platform/commonUI/general/res/sass/forms/_filter.scss index 05d4d3537d..63a0228718 100644 --- a/platform/commonUI/general/res/sass/forms/_filter.scss +++ b/platform/commonUI/general/res/sass/forms/_filter.scss @@ -144,11 +144,4 @@ &:hover:before { color: pullForward($colorInputIcon, 10%); } - - .clear-icon { - // 'x' in circle icon - &:before { - content: '\e607'; - } - } } \ No newline at end of file diff --git a/platform/commonUI/general/res/sass/overlay/_overlay.scss b/platform/commonUI/general/res/sass/overlay/_overlay.scss index 279f738e37..c89b07995b 100644 --- a/platform/commonUI/general/res/sass/overlay/_overlay.scss +++ b/platform/commonUI/general/res/sass/overlay/_overlay.scss @@ -25,7 +25,7 @@ background: $colorOvrBlocker; z-index: 100; } - .clk-icon.close { + .close { font-size: 0.8rem; position: absolute; top: $interiorMarginLg; diff --git a/platform/commonUI/general/res/sass/search/_search.scss b/platform/commonUI/general/res/sass/search/_search.scss index d85740ee98..408f8c8eaa 100644 --- a/platform/commonUI/general/res/sass/search/_search.scss +++ b/platform/commonUI/general/res/sass/search/_search.scss @@ -23,15 +23,9 @@ .clear-icon, .menu-icon { cursor: pointer; - font-family: symbolsfont; @include trans-prop-nice((opacity, color), 150ms); } -.clear-icon { - // 'x' in circle icon - @extend .icon-x-in-circle; -} - .holder-search { $iconWidth: 20px; @@ -51,6 +45,7 @@ &:before, .clear-icon, .menu-icon { + // :before is magnify glass icon box-sizing: border-box; color: $colorInputIcon; height: $iconD; @@ -104,7 +99,6 @@ .menu-icon { // 'v' invoke menu icon - &:before { content: '\e902'; } font-size: 0.8em; padding-right: $iconEdgeM; right: $iconEdgeM; diff --git a/platform/commonUI/general/res/templates/controls/input-filter.html b/platform/commonUI/general/res/templates/controls/input-filter.html index 07446ed35e..25e5293da8 100644 --- a/platform/commonUI/general/res/templates/controls/input-filter.html +++ b/platform/commonUI/general/res/templates/controls/input-filter.html @@ -25,7 +25,7 @@ - diff --git a/platform/commonUI/general/res/templates/controls/time-controller.html b/platform/commonUI/general/res/templates/controls/time-controller.html index cd36236358..a7480646cb 100644 --- a/platform/commonUI/general/res/templates/controls/time-controller.html +++ b/platform/commonUI/general/res/templates/controls/time-controller.html @@ -22,7 +22,7 @@
- C + {{active.notification.model.primaryOption.label}} - +
\ No newline at end of file diff --git a/platform/search/res/templates/search.html b/platform/search/res/templates/search.html index e3f72e78b5..a917e50bc3 100644 --- a/platform/search/res/templates/search.html +++ b/platform/search/res/templates/search.html @@ -27,10 +27,10 @@ type="text" ng-model="ngModel.input" ng-keyup="controller.search()"/> - -