]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
Merge branch 'andreasbovens-master' into 2.0.3-wip
authorMark Otto <markotto@twitter.com>
Sun, 25 Mar 2012 07:07:09 +0000 (00:07 -0700)
committerMark Otto <markotto@twitter.com>
Sun, 25 Mar 2012 07:07:09 +0000 (00:07 -0700)
1  2 
docs/assets/css/bootstrap.css
less/progress-bars.less

Simple merge
index 3da1f6f17623a7ef3cf26ecaba213d1cf181ec24,e6e30b34c472846245809180f12e95e534995462..3b47e64828f650d39fa3712512373ae43dc7121a
  
  // 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; }
  }