From f574ffed1691517ee8dd811fef4ab25898180827 Mon Sep 17 00:00:00 2001 From: Charles Hacskaylo Date: Wed, 22 Jun 2016 14:37:34 -0700 Subject: [PATCH] [Frontend] Refactoring glyphs to classes fixes #1047 In-progess, e900 > e904 --- platform/commonUI/browse/res/templates/menu-arrow.html | 2 +- platform/commonUI/general/res/sass/_constants.scss | 6 +++--- platform/commonUI/general/res/sass/_glyphs.scss | 9 +++++++++ platform/commonUI/general/res/sass/_inspector.scss | 2 +- platform/commonUI/general/res/sass/_main.scss | 1 + platform/commonUI/general/res/sass/_mixins.scss | 2 +- .../commonUI/general/res/sass/controls/_buttons.scss | 8 ++++---- .../commonUI/general/res/sass/controls/_controls.scss | 4 ++-- .../commonUI/general/res/sass/controls/_messages.scss | 8 ++++---- platform/commonUI/general/res/sass/search/_search.scss | 3 +-- platform/commonUI/general/res/sass/tree/_tree.scss | 2 +- platform/commonUI/inspect/res/templates/info-button.html | 2 +- 12 files changed, 29 insertions(+), 20 deletions(-) create mode 100644 platform/commonUI/general/res/sass/_glyphs.scss diff --git a/platform/commonUI/browse/res/templates/menu-arrow.html b/platform/commonUI/browse/res/templates/menu-arrow.html index e266d92d68..21d8aba06d 100644 --- a/platform/commonUI/browse/res/templates/menu-arrow.html +++ b/platform/commonUI/browse/res/templates/menu-arrow.html @@ -22,5 +22,5 @@ v + ng-click='menuArrow.showMenu($event)'> \ No newline at end of file diff --git a/platform/commonUI/general/res/sass/_constants.scss b/platform/commonUI/general/res/sass/_constants.scss index 2175f11ab1..22ba4e9d97 100644 --- a/platform/commonUI/general/res/sass/_constants.scss +++ b/platform/commonUI/general/res/sass/_constants.scss @@ -139,6 +139,6 @@ $browseToEditAnimMs: 400ms; $editBorderPulseMs: 500ms; /************************** LIMITS */ -$glyphLimit: '\e603'; -$glyphLimitUpr: '\0000eb'; -$glyphLimitLwr: '\0000ee'; +$glyphLimit: '\e901'; +$glyphLimitUpr: '\e905'; +$glyphLimitLwr: '\e908'; diff --git a/platform/commonUI/general/res/sass/_glyphs.scss b/platform/commonUI/general/res/sass/_glyphs.scss new file mode 100644 index 0000000000..4a3bbb8913 --- /dev/null +++ b/platform/commonUI/general/res/sass/_glyphs.scss @@ -0,0 +1,9 @@ +@mixin glyph($unicode) { + &:before { content: $unicode; } +} + +.ui-symbol, +.icon { + &.mobile-info { @include glyph('\e920'); } + &.context-available { @include glyph('\e902'); } +} \ No newline at end of file diff --git a/platform/commonUI/general/res/sass/_inspector.scss b/platform/commonUI/general/res/sass/_inspector.scss index dcfad71c00..68465e7442 100644 --- a/platform/commonUI/general/res/sass/_inspector.scss +++ b/platform/commonUI/general/res/sass/_inspector.scss @@ -159,7 +159,7 @@ } &:not(.last) .t-object-label .t-title-label:after { color: pushBack($colorInspectorFg, 15%); - content: '\3e'; + content: '\e904'; display: inline-block; font-family: symbolsfont; font-size: 8px; diff --git a/platform/commonUI/general/res/sass/_main.scss b/platform/commonUI/general/res/sass/_main.scss index bc20fe9e1c..131896e31b 100644 --- a/platform/commonUI/general/res/sass/_main.scss +++ b/platform/commonUI/general/res/sass/_main.scss @@ -59,6 +59,7 @@ @import "overlay/overlay"; @import "mobile/overlay/overlay"; @import "tree/tree"; +@import "glyphs"; @import "object-label"; @import "mobile/tree"; @import "user-environ/frame"; diff --git a/platform/commonUI/general/res/sass/_mixins.scss b/platform/commonUI/general/res/sass/_mixins.scss index 1c04dc18d9..8627c97336 100644 --- a/platform/commonUI/general/res/sass/_mixins.scss +++ b/platform/commonUI/general/res/sass/_mixins.scss @@ -344,7 +344,7 @@ @mixin contextArrow() { text-shadow: none; - content: '\76'; + content: '\e902'; display: inline-block; font-family: 'symbolsfont'; margin-left: $interiorMarginSm; diff --git a/platform/commonUI/general/res/sass/controls/_buttons.scss b/platform/commonUI/general/res/sass/controls/_buttons.scss index 09c4598db7..ec53c88dc8 100644 --- a/platform/commonUI/general/res/sass/controls/_buttons.scss +++ b/platform/commonUI/general/res/sass/controls/_buttons.scss @@ -180,14 +180,14 @@ body.desktop .mini-tab { // |< text-align: right; &:before { - content:'\3c'; // Collapse left icon e613 + content:'\e903'; // Collapse left icon e613 right: $iconInnerLR; } &.collapsed { @include border-left-radius(0); text-align: left; &:before { - content:'\3e'; + content:'\e904'; left: $iconInnerLR; } &:hover:before { left: $arwAnimOffsetX; } @@ -197,14 +197,14 @@ body.desktop .mini-tab { // >| text-align: left; &:before { - content:'\3e'; // Collapse right icon e614 + content:'\e904'; // Collapse right icon e614 left: $iconInnerLR; } &.collapsed { @include border-right-radius(0); &:before { text-align: right; - content:'\3c'; + content:'\e903'; right: $iconInnerLR; } &:hover:before { right: $arwAnimOffsetX; } diff --git a/platform/commonUI/general/res/sass/controls/_controls.scss b/platform/commonUI/general/res/sass/controls/_controls.scss index 9cc835348b..f1fe17be8c 100644 --- a/platform/commonUI/general/res/sass/controls/_controls.scss +++ b/platform/commonUI/general/res/sass/controls/_controls.scss @@ -441,14 +441,14 @@ input[type="search"] { &.prev { right: auto; &:before { - content: "\3c"; + content: "\e903"; } } &.next { left: auto; text-align: right; &:before { - content: "\3e"; + content: "\e903"; } } } diff --git a/platform/commonUI/general/res/sass/controls/_messages.scss b/platform/commonUI/general/res/sass/controls/_messages.scss index 015b9db559..2268fe42e5 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:"\e608"; } + &:before { content:"\e920"; } color: $colorStatusDefault; font-size: $iconW; padding: 1px; @@ -241,15 +241,15 @@ } .message-severity-info .type-icon.message-type { - &:before { content:"\e608"; } + &:before { content:"\e920"; } color: $colorStatusInfo; } .message-severity-alert .type-icon.message-type { - &:before { content:"\e610"; } + &:before { content:"\e911"; } color: $colorStatusAlert; } .message-severity-error .type-icon.message-type { - &:before { content:"\21"; } + &:before { content:"\e900"; } color: $colorStatusError; } } diff --git a/platform/commonUI/general/res/sass/search/_search.scss b/platform/commonUI/general/res/sass/search/_search.scss index a831dedf08..66c5c5fcf2 100644 --- a/platform/commonUI/general/res/sass/search/_search.scss +++ b/platform/commonUI/general/res/sass/search/_search.scss @@ -107,12 +107,11 @@ .menu-icon { // 'v' invoke menu icon - &:before { content: '\76'; } + &:before { content: '\e902'; } font-size: 0.8em; padding-right: $iconEdgeM; right: $iconEdgeM; text-align: right; - &:hover { color: pullForward($colorInputIcon, 10%); } diff --git a/platform/commonUI/general/res/sass/tree/_tree.scss b/platform/commonUI/general/res/sass/tree/_tree.scss index 40c93e110d..5918b9c9d5 100644 --- a/platform/commonUI/general/res/sass/tree/_tree.scss +++ b/platform/commonUI/general/res/sass/tree/_tree.scss @@ -56,7 +56,7 @@ ul.tree { &:before { position: absolute; @include trans-prop-nice(transform, 100ms); - content: "\3e"; + content: "\e904"; @include transform-origin(center); } &.expanded:before { diff --git a/platform/commonUI/inspect/res/templates/info-button.html b/platform/commonUI/inspect/res/templates/info-button.html index fce10450ff..4745a29561 100644 --- a/platform/commonUI/inspect/res/templates/info-button.html +++ b/platform/commonUI/inspect/res/templates/info-button.html @@ -21,4 +21,4 @@ --> - +