aboutsummaryrefslogtreecommitdiff
path: root/dist/css/bootstrap.css
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2013-10-26 14:12:07 +0100
committerMark Otto <[email protected]>2013-10-26 14:12:07 +0100
commit0c714c32f92391b6cda1657219295df57200befe (patch)
tree387dfee8afc71930d68e3ebdf7af1624902f25b6 /dist/css/bootstrap.css
parent72cfe877d8585054558cb83222d207159f854dd1 (diff)
parent64ffed87a4809388eeab891cb7c43284393e12e2 (diff)
downloadbootstrap-0c714c32f92391b6cda1657219295df57200befe.tar.xz
bootstrap-0c714c32f92391b6cda1657219295df57200befe.zip
Merge branch 'master' of github.com:twbs/bootstrap
Diffstat (limited to 'dist/css/bootstrap.css')
-rw-r--r--dist/css/bootstrap.css3
1 files changed, 0 insertions, 3 deletions
diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css
index 00cb6337e..1aa21cec2 100644
--- a/dist/css/bootstrap.css
+++ b/dist/css/bootstrap.css
@@ -5410,9 +5410,6 @@ a.thumbnail.active {
.progress.active .progress-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;
}