Skip to content

B
bootstrap
Commit 223c8358 authored by Mark Otto's avatar Mark Otto
Browse files
Options

Merge branch 'andreasbovens-master' into 2.0.3-wip

parents 3e792082 de0aaff4
Hide whitespace changes
Inline Side-by-side
Showing with 10 additions and 0 deletions
docs/assets/css/bootstrap.css
View file @ 223c8358
...@@ -3747,6 +3747,8 @@ a.badge:hover { ...@@ -3747,6 +3747,8 @@ a.badge:hover {
.progress.active .bar { .progress.active .bar {
-webkit-animation: progress-bar-stripes 2s linear infinite; -webkit-animation: progress-bar-stripes 2s linear infinite;
-moz-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; animation: progress-bar-stripes 2s linear infinite;
} }
.progress-danger .bar { .progress-danger .bar {
......
less/progress-bars.less
View file @ 223c8358
...@@ -23,6 +23,12 @@ ...@@ -23,6 +23,12 @@
to { background-position: 0 0; } to { background-position: 0 0; }
} }
// Opera
@-o-keyframes progress-bar-stripes {
from { background-position: 0 0; }
to { background-position: 40px 0; }
}
// Spec // Spec
@keyframes progress-bar-stripes { @keyframes progress-bar-stripes {
from { background-position: 40px 0; } from { background-position: 40px 0; }
...@@ -68,6 +74,8 @@ ...@@ -68,6 +74,8 @@
.progress.active .bar { .progress.active .bar {
-webkit-animation: progress-bar-stripes 2s linear infinite; -webkit-animation: progress-bar-stripes 2s linear infinite;
-moz-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; animation: progress-bar-stripes 2s linear infinite;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment