1
0
mirror of https://github.com/twbs/bootstrap.git synced 2025-02-24 12:40:58 +00:00

Merge pull request #11244 from ZDroid/animation

Add .animation() mixin
This commit is contained in:
Mark Otto 2013-10-26 05:49:58 -07:00
commit 64ffed87a4
4 changed files with 8 additions and 10 deletions

View File

@ -5410,9 +5410,6 @@ a.thumbnail.active {
.progress.active .progress-bar { .progress.active .progress-bar {
-webkit-animation: progress-bar-stripes 2s linear infinite; -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;
} }

File diff suppressed because one or more lines are too long

View File

@ -193,12 +193,17 @@
-moz-perspective-origin: @perspective; -moz-perspective-origin: @perspective;
perspective-origin: @perspective; perspective-origin: @perspective;
} }
.transform-origin(@origin){ .transform-origin(@origin) {
-webkit-transform-origin: @origin; -webkit-transform-origin: @origin;
-moz-transform-origin: @origin; -moz-transform-origin: @origin;
transform-origin: @origin; transform-origin: @origin;
} }
// Animations
.animation(@animation) {
-webkit-animation: @animation;
animation: @animation;
}
// Backface visibility // Backface visibility
// Prevent browsers from flickering when using CSS 3D transforms. // Prevent browsers from flickering when using CSS 3D transforms.

View File

@ -67,11 +67,7 @@
// Call animation for the active one // Call animation for the active one
.progress.active .progress-bar { .progress.active .progress-bar {
-webkit-animation: progress-bar-stripes 2s linear infinite; .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;
} }