diff options
| author | Mark Otto <[email protected]> | 2013-10-26 14:12:07 +0100 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-10-26 14:12:07 +0100 |
| commit | 0c714c32f92391b6cda1657219295df57200befe (patch) | |
| tree | 387dfee8afc71930d68e3ebdf7af1624902f25b6 /less | |
| parent | 72cfe877d8585054558cb83222d207159f854dd1 (diff) | |
| parent | 64ffed87a4809388eeab891cb7c43284393e12e2 (diff) | |
| download | bootstrap-0c714c32f92391b6cda1657219295df57200befe.tar.xz bootstrap-0c714c32f92391b6cda1657219295df57200befe.zip | |
Merge branch 'master' of github.com:twbs/bootstrap
Diffstat (limited to 'less')
| -rw-r--r-- | less/mixins.less | 7 | ||||
| -rw-r--r-- | less/progress-bars.less | 6 |
2 files changed, 7 insertions, 6 deletions
diff --git a/less/mixins.less b/less/mixins.less index 4e842ed87..f06d6a89b 100644 --- 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 index d0bb19e02..507c82dbd 100644 --- 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); } |