[Frontend] Refactoring glyphs to classes

Fixes #1047 In-progress; .labeled added to .s-btn, removed .s-icon-btn
nasa · Jun 28, 2016 · 4e2a01a · 4e2a01a
1 parent 521db3c
commit 4e2a01a
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 21 deletions.
diff --git a/platform/commonUI/edit/bundle.js b/platform/commonUI/edit/bundle.js
@@ -208,7 +208,7 @@ define([
                     "category": "conclude-editing",
                     "implementation": SaveAction,
                     "name": "Save",
-                    "cssclass": "icon-save",
+                    "cssclass": "icon-save labeled",
                     "description": "Save changes made to these objects.",
                     "depends": [
                         "dialogService"
@@ -220,7 +220,7 @@ define([
                     "category": "conclude-editing",
                     "implementation": SaveAsAction,
                     "name": "Save As...",
-                    "cssclass": "icon-save",
+                    "cssclass": "icon-save labeled",
                     "description": "Save changes made to these objects.",
                     "depends": [
                         "$injector",

diff --git a/platform/commonUI/general/res/sass/controls/_buttons.scss b/platform/commonUI/general/res/sass/controls/_buttons.scss
@@ -22,8 +22,7 @@
 $baseRatio: 1.5;
 $pad: $interiorMargin * $baseRatio;
 
-.s-btn,
-.s-icon-btn {
+.s-btn {
     @include user-select(none);
     cursor: pointer;
     text-decoration: none;
@@ -38,7 +37,7 @@ $pad: $interiorMargin * $baseRatio;
     vertical-align: top;
     @include btnSubtle($colorBtnBg, $colorBtnBgHov, $colorBtnFg, $colorBtnIcon);
 
-    &:before {
+    &.labeled:before {
         // Icon when it's included
         margin-right: $interiorMarginSm;
     }
@@ -83,21 +82,6 @@ $pad: $interiorMargin * $baseRatio;
     }
 }
 
-.s-icon-btn {
-    // TODO: glyph refactoring
-    $c: $colorKey;
-    @extend .s-btn;
-    &:before {
-        @extend .ui-symbol;
-        content: '\e901';
-        color: $colorKey;
-        margin-right: $interiorMargin;
-    }
-    &:hover:before {
-        color: pullForward($c, 10%);
-    }
-}
-
 body.desktop .mini-tab {
     // Meant to be used as pane hide/show control elements in concert with mct-splitter
     $iconH: $uePaneMiniTabH;

diff --git a/platform/features/table/res/templates/mct-table.html b/platform/features/table/res/templates/mct-table.html
@@ -1,4 +1,4 @@
-<a class="t-btn l-btn s-btn t-export icon-download"
+<a class="t-btn l-btn s-btn t-export icon-download labeled"
    ng-click="exportAsCSV()"
    title="Export This View's Data">
     Export