[Frontend] Refactoring glyphs to classes

fixes #1047
In progress: moved limits classes out
of _contants and into _glyphs;
timers, entanglement context menu items,
form validation, date picker.
This commit is contained in:
Charles Hacskaylo 2016-06-30 12:11:25 -07:00
parent 95d26e6fe7
commit 272b4b649e
6 changed files with 40 additions and 26 deletions

View File

@ -136,8 +136,3 @@ $dirImgs: $dirCommonRes + 'images/';
$controlFadeMs: 100ms; $controlFadeMs: 100ms;
$browseToEditAnimMs: 400ms; $browseToEditAnimMs: 400ms;
$editBorderPulseMs: 500ms; $editBorderPulseMs: 500ms;
/************************** LIMITS */
$glyphLimit: $glyph-icon-alert-triangle;
$glyphLimitUpr: $glyph-icon-arrow-double-up;
$glyphLimitLwr: $glyph-icon-arrow-double-down;

View File

@ -5,6 +5,8 @@
} }
} }
/************************** CHAR UNICODES */
$glyph-icon-alert-rect: '\e900'; $glyph-icon-alert-rect: '\e900';
$glyph-icon-alert-triangle: '\e901'; $glyph-icon-alert-triangle: '\e901';
$glyph-icon-arrow-down: '\e902'; $glyph-icon-arrow-down: '\e902';
@ -99,6 +101,8 @@ $glyph-icon-timeline: '\e1124';
$glyph-icon-timer: '\e1125'; $glyph-icon-timer: '\e1125';
$glyph-icon-topic: '\e1126'; $glyph-icon-topic: '\e1126';
/************************** CLASSES */
.icon-alert-rect { @include glyph($glyph-icon-alert-rect); } .icon-alert-rect { @include glyph($glyph-icon-alert-rect); }
.icon-alert-triangle { @include glyph($glyph-icon-alert-triangle); } .icon-alert-triangle { @include glyph($glyph-icon-alert-triangle); }
.icon-arrow-down { @include glyph($glyph-icon-arrow-down); } .icon-arrow-down { @include glyph($glyph-icon-arrow-down); }
@ -191,4 +195,10 @@ $glyph-icon-topic: '\e1126';
.icon-telemetry-panel { @include glyph($glyph-icon-telemetry-panel); } .icon-telemetry-panel { @include glyph($glyph-icon-telemetry-panel); }
.icon-timeline { @include glyph($glyph-icon-timeline); } .icon-timeline { @include glyph($glyph-icon-timeline); }
.icon-timer { @include glyph($glyph-icon-timer); } .icon-timer { @include glyph($glyph-icon-timer); }
.icon-topic { @include glyph($glyph-icon-topic); } .icon-topic { @include glyph($glyph-icon-topic); }
/************************** LIMITS */
$glyphLimit: $glyph-icon-alert-triangle;
$glyphLimitUpr: $glyph-icon-arrow-double-up;
$glyphLimitLwr: $glyph-icon-arrow-double-down;

View File

@ -444,17 +444,13 @@ input[type="search"] {
width: $pagerW; width: $pagerW;
@extend .ui-symbol; @extend .ui-symbol;
&.prev { &.prev {
@extend .icon-arrow-left;
right: auto; right: auto;
&:before {
content: "\e903";
}
} }
&.next { &.next {
@extend .icon-arrow-right;
left: auto; left: auto;
text-align: right; text-align: right;
&:before {
content: "\e903";
}
} }
} }
.val { .val {

View File

@ -8,6 +8,15 @@
} }
&.l-timer { &.l-timer {
.l-value:before,
.control {
font-size: 0.8em;
}
.l-value:before {
// Direction +/- element
margin-right: $interiorMarginSm;
}
.control { .control {
@include trans-prop-nice((width, opacity), $transTime); @include trans-prop-nice((width, opacity), $transTime);
line-height: inherit; line-height: inherit;
@ -25,8 +34,5 @@
.value { .value {
color: pullForward($colorBodyFg, 50%); color: pullForward($colorBodyFg, 50%);
font-weight: 400; font-weight: 400;
.direction {
font-size: 0.8em;
}
} }
} }

View File

@ -22,10 +22,9 @@
.validates { .validates {
> .label { > .label {
padding-right: $reqSymbolM; // Keep room for validation element padding-right: $reqSymbolM; // Keep room for validation element
&::after { &:before {
position: absolute; position: absolute;
right: $interiorMargin; right: $interiorMargin;
font-family: symbolsfont;
font-size: $reqSymbolFontSize; font-size: $reqSymbolFontSize;
height: 100%; height: 100%;
line-height: 200%; line-height: 200%;
@ -34,22 +33,28 @@
} }
&.invalid, &.invalid,
&.invalid.req { &.invalid.req {
> .label::after { > .label {
color: $colorFormInvalid; @extend .icon-x;
content: "x"; &:before {
color: $colorFormInvalid;
}
} }
} }
&.valid, &.valid,
&.valid.req { &.valid.req {
> .label::after { > .label {
color: $colorFormValid; @extend .icon-check;
content: "2"; &:before {
color: $colorFormValid;
}
} }
} }
&.req { &.req {
> .label::after { > .label {
color: $colorFormRequired; @extend .icon-asterisk;
content: "*"; &:before {
color: $colorFormRequired;
}
} }
} }
} }

View File

@ -112,6 +112,7 @@ define([
"name": "Go To Original", "name": "Go To Original",
"description": "Go to the original, un-linked instance of this object.", "description": "Go to the original, un-linked instance of this object.",
"glyph": "", "glyph": "",
"cssclass": "",
"category": "contextual", "category": "contextual",
"implementation": GoToOriginalAction "implementation": GoToOriginalAction
}, },
@ -120,6 +121,7 @@ define([
"name": "Set Primary Location", "name": "Set Primary Location",
"description": "Set a domain object's primary location.", "description": "Set a domain object's primary location.",
"glyph": "", "glyph": "",
"cssclass": "",
"category": "contextual", "category": "contextual",
"implementation": SetPrimaryLocationAction "implementation": SetPrimaryLocationAction
} }