ExternalVendorCode/openmct
1
0
Fork 0
mirror of https://github.com/nasa/openmct.git synced 2025-02-10 21:01:31 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[Frontend] Refactoring glyphs to classes

Browse Source 
Fixes #1047
In-progress; .labeled added  to .s-btn,
removed .s-icon-btn
This commit is contained in:
Charles Hacskaylo 2016-06-28 16:21:05 -07:00
parent 521db3c3fe
commit 4e2a01ad85
3 changed files with 5 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
platform/commonUI/edit/bundle.js
View File

@ -208,7 +208,7 @@ define([
"category": "conclude-editing", "category": "conclude-editing",
"implementation": SaveAction, "implementation": SaveAction,
"name": "Save", "name": "Save",
"cssclass": "icon-save", "cssclass": "icon-save labeled",
"description": "Save changes made to these objects.", "description": "Save changes made to these objects.",
"depends": [ "depends": [
"dialogService" "dialogService"
@ -220,7 +220,7 @@ define([
"category": "conclude-editing", "category": "conclude-editing",
"implementation": SaveAsAction, "implementation": SaveAsAction,
"name": "Save As...", "name": "Save As...",
"cssclass": "icon-save", "cssclass": "icon-save labeled",
"description": "Save changes made to these objects.", "description": "Save changes made to these objects.",
"depends": [ "depends": [
"$injector", "$injector",

20
platform/commonUI/general/res/sass/controls/_buttons.scss
View File

@ -22,8 +22,7 @@
$baseRatio: 1.5; $baseRatio: 1.5;
$pad: $interiorMargin * $baseRatio; $pad: $interiorMargin * $baseRatio;
.s-btn, .s-btn {
.s-icon-btn {
@include user-select(none); @include user-select(none);
cursor: pointer; cursor: pointer;
text-decoration: none; text-decoration: none;
@ -38,7 +37,7 @@ $pad: $interiorMargin * $baseRatio;
vertical-align: top; vertical-align: top;
@include btnSubtle($colorBtnBg, $colorBtnBgHov, $colorBtnFg, $colorBtnIcon); @include btnSubtle($colorBtnBg, $colorBtnBgHov, $colorBtnFg, $colorBtnIcon);
&:before { &.labeled:before {
// Icon when it's included // Icon when it's included
margin-right: $interiorMarginSm; 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 { body.desktop .mini-tab {
// Meant to be used as pane hide/show control elements in concert with mct-splitter // Meant to be used as pane hide/show control elements in concert with mct-splitter
$iconH: $uePaneMiniTabH; $iconH: $uePaneMiniTabH;

2
platform/features/table/res/templates/mct-table.html
View File

@ -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()" ng-click="exportAsCSV()"
title="Export This View's Data"> title="Export This View's Data">
Export Export