Merge pull request #11244 from ZDroid/animation

Add .animation() mixin
twbs · Oct 26, 2013 · 64ffed8 · 64ffed8
2 parents 4fac7b6 + aff291e
commit 64ffed8
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 10 deletions.
diff --git 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;
 }
 

diff --git a/dist/css/bootstrap.min.css b/dist/css/bootstrap.min.css
diff --git a/less/mixins.less b/less/mixins.less
@@ -193,12 +193,17 @@
      -moz-perspective-origin: @perspective;
           perspective-origin: @perspective;
 }
-.transform-origin(@origin){
+.transform-origin(@origin) {
   -webkit-transform-origin: @origin;
      -moz-transform-origin: @origin;
           transform-origin: @origin;
 }
 
+// Animations
+.animation(@animation) {
+  -webkit-animation: @animation;
+          animation: @animation;
+}
 
 // Backface visibility
 // Prevent browsers from flickering when using CSS 3D transforms.

diff --git a/less/progress-bars.less b/less/progress-bars.less
@@ -67,11 +67,7 @@
 
 // Call animation for the active one
 .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;
+  .animation(progress-bar-stripes 2s linear infinite);
 }