aboutsummaryrefslogtreecommitdiff
path: root/less/progress-bars.less
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2012-03-25 00:07:09 -0700
committerMark Otto <[email protected]>2012-03-25 00:07:09 -0700
commit223c8358ceb111fc7a9fc48f88b913e88df4006f (patch)
tree8584f8767b510c06a1b88cec633126c12c23972f /less/progress-bars.less
parent3e7920820a4c8b93282628ade9281ff0d4484a45 (diff)
parentde0aaff4338acc72b5c6220f4731b7fa7c52ac2c (diff)
downloadbootstrap-223c8358ceb111fc7a9fc48f88b913e88df4006f.tar.xz
bootstrap-223c8358ceb111fc7a9fc48f88b913e88df4006f.zip
Merge branch 'andreasbovens-master' into 2.0.3-wip
Diffstat (limited to 'less/progress-bars.less')
-rw-r--r--less/progress-bars.less8
1 files changed, 8 insertions, 0 deletions
diff --git a/less/progress-bars.less b/less/progress-bars.less
index 3da1f6f17..3b47e6482 100644
--- a/less/progress-bars.less
+++ b/less/progress-bars.less
@@ -23,6 +23,12 @@
to { background-position: 0 0; }
}
+// Opera
+@-o-keyframes progress-bar-stripes {
+ from { background-position: 0 0; }
+ to { background-position: 40px 0; }
+}
+
// Spec
@keyframes progress-bar-stripes {
from { background-position: 40px 0; }
@@ -68,6 +74,8 @@
.progress.active .bar {
-webkit-animation: progress-bar-stripes 2s linear infinite;
-moz-animation: progress-bar-stripes 2s linear infinite;
+ -ms-animation: progress-bar-stripes 2s linear infinite;
+ -o-animation: progress-bar-stripes 2s linear infinite;
animation: progress-bar-stripes 2s linear infinite;
}