alihan/openmct
1
0
Fork 0
Code Issues Pull Requests 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
parent 70f5a001ee 685e384858
commit 3df12788f9
4 changed files with 20 additions and 9 deletions
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 {
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;

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

@@ -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);
}

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

@@ -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 {