Merge branch 'master' of github.com:twbs/bootstrap

0c714c32 · Mark Otto · 72cfe877 · 64ffed87 · 0c714c32 · 0c714c32
Commit 0c714c32 authored Oct 26, 2013 by Mark Otto
Showing with 8 additions and 10 deletions

dist/css/bootstrap.css dist/css/bootstrap.css +0 -3

dist/css/bootstrap.min.css dist/css/bootstrap.min.css +1 -1

less/mixins.less less/mixins.less +6 -1

less/progress-bars.less less/progress-bars.less +1 -5

No files found.
--- 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;
 }


--- a/dist/css/bootstrap.min.css
+++ b/dist/css/bootstrap.min.css
--- 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.

--- 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);
 }