summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJouni Koivuviita <jouni@vaadin.com>2014-06-13 11:49:43 +0300
committerJouni Koivuviita <jouni@vaadin.com>2014-06-18 07:56:00 +0000
commitce1b961bc3b2461037dba36475a4800efba01c66 (patch)
treec11d849c46be532a6b475e6d65269f8b9a8188c8
parent7b565d099e0723593c7ec187303a27242e766c1c (diff)
downloadvaadin-framework-ce1b961bc3b2461037dba36475a4800efba01c66.tar.gz
vaadin-framework-ce1b961bc3b2461037dba36475a4800efba01c66.zip
Fix spinner mixin for IE8 and IE9
Fixes indeterminate ProgressBar style as well (using the spinner mixin). Change-Id: I35729e465e2249515fc4668167b1d18aa3783a97
-rw-r--r--WebContent/VAADIN/themes/valo/components/_progressbar.scss8
-rw-r--r--WebContent/VAADIN/themes/valo/shared/_loading-indicator.scss15
2 files changed, 23 insertions, 0 deletions
diff --git a/WebContent/VAADIN/themes/valo/components/_progressbar.scss b/WebContent/VAADIN/themes/valo/components/_progressbar.scss
index 2c7e9925e7..c7f7f72514 100644
--- a/WebContent/VAADIN/themes/valo/components/_progressbar.scss
+++ b/WebContent/VAADIN/themes/valo/components/_progressbar.scss
@@ -33,6 +33,14 @@ $v-progressbar-border-radius: $v-border-radius !default;
}
}
+ .#{$primary-stylename}-indeterminate {
+ @include valo-spinner;
+
+ .#{$primary-stylename}-wrapper {
+ display: none;
+ }
+ }
+
}
diff --git a/WebContent/VAADIN/themes/valo/shared/_loading-indicator.scss b/WebContent/VAADIN/themes/valo/shared/_loading-indicator.scss
index 88963d5950..03bfe301ea 100644
--- a/WebContent/VAADIN/themes/valo/shared/_loading-indicator.scss
+++ b/WebContent/VAADIN/themes/valo/shared/_loading-indicator.scss
@@ -27,6 +27,21 @@
border-radius: 100%;
@include animation(v-rotate-360 $speed infinite linear);
pointer-events: none;
+
+ // No CSS animation in IE8 and IE9
+ .v-ie8 &,
+ .v-ie9 & {
+ border: none;
+ border-radius: $v-border-radius;
+ background: #fff url($valo-shared-pathPrefix + "img/spinner.gif") no-repeat 50% 50%;
+ background-size: 80%;
+ }
+
+ // No background-size for IE8
+ .v-ie8 & {
+ min-width: 30px;
+ min-height: 30px;
+ }
}