aboutsummaryrefslogtreecommitdiff
path: root/docs/assets/css/bootstrap.css
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 /docs/assets/css/bootstrap.css
parent3e7920820a4c8b93282628ade9281ff0d4484a45 (diff)
parentde0aaff4338acc72b5c6220f4731b7fa7c52ac2c (diff)
downloadbootstrap-223c8358ceb111fc7a9fc48f88b913e88df4006f.tar.xz
bootstrap-223c8358ceb111fc7a9fc48f88b913e88df4006f.zip
Merge branch 'andreasbovens-master' into 2.0.3-wip
Diffstat (limited to 'docs/assets/css/bootstrap.css')
-rw-r--r--docs/assets/css/bootstrap.css2
1 files changed, 2 insertions, 0 deletions
diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index b1417228e..794156e27 100644
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -3747,6 +3747,8 @@ a.badge:hover {
.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;
}
.progress-danger .bar {