2
0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-05-18 12:39:41 +03: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
4 changed files with 8 additions and 10 deletions
-3
View File
@@ -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;
}
+1 -1
View File
File diff suppressed because one or more lines are too long
+6 -1
View File
@@ -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.
+1 -5
View File
@@ -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);
}