From: Mark Otto <markotto@twitter.com>
Date: Sun, 25 Mar 2012 07:07:09 +0000 (-0700)
Subject: Merge branch 'andreasbovens-master' into 2.0.3-wip
X-Git-Tag: v2.0.3~5^2~100
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=223c8358ceb111fc7a9fc48f88b913e88df4006f;p=thirdparty%2Fbootstrap.git

Merge branch 'andreasbovens-master' into 2.0.3-wip
---

223c8358ceb111fc7a9fc48f88b913e88df4006f
diff --cc less/progress-bars.less
index 3da1f6f176,e6e30b34c4..3b47e64828
--- a/less/progress-bars.less
+++ b/less/progress-bars.less
@@@ -19,14 -19,20 +19,20 @@@
  
  // IE9
  @-ms-keyframes progress-bar-stripes {
 -  from  { background-position: 0 0; }
 -  to    { background-position: 40px 0; }
 +  from  { background-position: 40px 0; }
 +  to    { background-position: 0 0; }
  }
  
+ // Opera
+ @-o-keyframes progress-bar-stripes {
+   from  { background-position: 0 0; }
+   to    { background-position: 40px 0; }
+ }
+ 
  // Spec
  @keyframes progress-bar-stripes {
 -  from  { background-position: 0 0; }
 -  to    { background-position: 40px 0; }
 +  from  { background-position: 40px 0; }
 +  to    { background-position: 0 0; }
  }