ExternalVendorCode/openmct
1
0
Fork 0
mirror of https://github.com/nasa/openmct.git synced 2024-12-20 05:37:53 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'nasa/open1341' into open1345

Browse Source
This commit is contained in:
Victor Woeltjen 2015-06-25 11:53:13 -07:00
commit 3df12788f9
4 changed files with 20 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
platform/commonUI/general/res/css/theme-espresso.css
View File

@ -226,20 +226,20 @@ a.disabled {
@-moz-keyframes pulse { @-moz-keyframes pulse {
0% { 0% {
opacity: 0.5; } opacity: 0.2; }
100% { 100% {
opacity: 1; } } opacity: 1; } }
@-webkit-keyframes pulse { @-webkit-keyframes pulse {
0% { 0% {
opacity: 0.5; } opacity: 0.2; }
100% { 100% {
opacity: 1; } } opacity: 1; } }
@keyframes pulse { @keyframes pulse {
0% { 0% {
opacity: 0.5; } opacity: 0.2; }
100% { 100% {
opacity: 1; } } opacity: 1; } }
/* line 59, ../sass/_effects.scss */ /* line 69, ../sass/_effects.scss */
.pulse { .pulse {
-moz-animation-name: pulse; -moz-animation-name: pulse;
-webkit-animation-name: pulse; -webkit-animation-name: pulse;

16
platform/commonUI/general/res/sass/_effects.scss
View File

@ -43,16 +43,26 @@ a.disabled {
@include test(); @include test();
} }
@mixin customKeyframes($animName: pulse, $op0: 0.5) {
@include keyframes($animName) {
0% { opacity: $op0; }
100% { opacity: 1; }
}
@include animation-name(pulse, 0.2);
}
@include keyframes(pulse) { @include keyframes(pulse) {
0% { opacity: 0.5; } 0% { opacity: 0.2; }
100% { opacity: 1; } 100% { opacity: 1; }
} }
@mixin pulse($dur: 500ms) {
@mixin pulse($dur: 500ms, $iteration: infinite) {
//@include customKeyframes(pulse, 0.2);
@include animation-name(pulse); @include animation-name(pulse);
@include animation-duration($dur); @include animation-duration($dur);
@include animation-direction(alternate); @include animation-direction(alternate);
@include animation-iteration-count(infinite); @include animation-iteration-count($iteration);
@include animation-timing-function(ease-in-out); @include animation-timing-function(ease-in-out);
} }

2
platform/commonUI/general/res/sass/_mixins.scss
View File

@ -26,7 +26,7 @@
width: auto; height: auto; width: auto; height: auto;
} }
@mixin trans-prop-nice($props, $t) { @mixin trans-prop-nice($props, $t: 500ms) {
@if $t == 0 { @if $t == 0 {
@include transition-property(none); @include transition-property(none);
} @else { } @else {

3
platform/features/layout/res/templates/elements/telemetry.html
View File

@ -24,7 +24,8 @@
ng-style="{ background: ngModel.fill(), 'border-color': ngModel.stroke(), color: ngModel.color() }" ng-style="{ background: ngModel.fill(), 'border-color': ngModel.stroke(), color: ngModel.color() }"
> >
<span <span
class="l-elem l-value obj-val-format ovf-{{ngModel.value}}" class="l-elem l-value l-obj-val-format"
data-value="{{ngModel.value}}"
ng-class="{ 'telem-only': !ngModel.element.titled }" ng-class="{ 'telem-only': !ngModel.element.titled }"
> >
{{ngModel.value}} {{ngModel.value}}