diff --git a/platform/commonUI/general/res/css/theme-espresso.css b/platform/commonUI/general/res/css/theme-espresso.css index 7f90da763e..5e44a592ae 100644 --- a/platform/commonUI/general/res/css/theme-espresso.css +++ b/platform/commonUI/general/res/css/theme-espresso.css @@ -226,20 +226,20 @@ a.disabled { @-moz-keyframes pulse { 0% { - opacity: 0.5; } + opacity: 0.2; } 100% { opacity: 1; } } @-webkit-keyframes pulse { 0% { - opacity: 0.5; } + opacity: 0.2; } 100% { opacity: 1; } } @keyframes pulse { 0% { - opacity: 0.5; } + opacity: 0.2; } 100% { opacity: 1; } } -/* line 59, ../sass/_effects.scss */ +/* line 69, ../sass/_effects.scss */ .pulse { -moz-animation-name: pulse; -webkit-animation-name: pulse; diff --git a/platform/commonUI/general/res/sass/_effects.scss b/platform/commonUI/general/res/sass/_effects.scss index c90a035c82..ddade4e965 100644 --- a/platform/commonUI/general/res/sass/_effects.scss +++ b/platform/commonUI/general/res/sass/_effects.scss @@ -43,16 +43,26 @@ a.disabled { @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) { - 0% { opacity: 0.5; } + 0% { opacity: 0.2; } 100% { opacity: 1; } } -@mixin pulse($dur: 500ms) { + +@mixin pulse($dur: 500ms, $iteration: infinite) { + //@include customKeyframes(pulse, 0.2); @include animation-name(pulse); @include animation-duration($dur); @include animation-direction(alternate); - @include animation-iteration-count(infinite); + @include animation-iteration-count($iteration); @include animation-timing-function(ease-in-out); } diff --git a/platform/commonUI/general/res/sass/_mixins.scss b/platform/commonUI/general/res/sass/_mixins.scss index 8fe4f731c0..14a123d954 100644 --- a/platform/commonUI/general/res/sass/_mixins.scss +++ b/platform/commonUI/general/res/sass/_mixins.scss @@ -26,7 +26,7 @@ width: auto; height: auto; } -@mixin trans-prop-nice($props, $t) { +@mixin trans-prop-nice($props, $t: 500ms) { @if $t == 0 { @include transition-property(none); } @else { diff --git a/platform/features/layout/res/templates/elements/telemetry.html b/platform/features/layout/res/templates/elements/telemetry.html index 46d45dbf46..87d17cc913 100644 --- a/platform/features/layout/res/templates/elements/telemetry.html +++ b/platform/features/layout/res/templates/elements/telemetry.html @@ -24,7 +24,8 @@ ng-style="{ background: ngModel.fill(), 'border-color': ngModel.stroke(), color: ngModel.color() }" > {{ngModel.value}}