0
0
mirror of https://github.com/twbs/bootstrap.git synced 2025-03-15 15:29:22 +01:00

Clean up mixins, fix #9100 (no ms-keyframes)

- Spacing tweaks in the general mixins
- Add comments to transform mixins about IE support
- Remove `-ms-keyframes` because only IE10+ supports it, and without
prefix
This commit is contained in:
Mark Otto 2013-08-05 08:11:13 -07:00
parent 7a98af5ec8
commit d6ed590e83
4 changed files with 10 additions and 25 deletions

View File

@ -4139,15 +4139,6 @@ a.list-group-item.active > .badge,
} }
} }
@-ms-keyframes progress-bar-stripes {
from {
background-position: 40px 0;
}
to {
background-position: 0 0;
}
}
@-o-keyframes progress-bar-stripes { @-o-keyframes progress-bar-stripes {
from { from {
background-position: 0 0; background-position: 0 0;

File diff suppressed because one or more lines are too long

View File

@ -130,22 +130,22 @@
// Transformations // Transformations
.rotate(@degrees) { .rotate(@degrees) {
-webkit-transform: rotate(@degrees); -webkit-transform: rotate(@degrees);
-ms-transform: rotate(@degrees); -ms-transform: rotate(@degrees); // IE9+
transform: rotate(@degrees); transform: rotate(@degrees);
} }
.scale(@ratio) { .scale(@ratio) {
-webkit-transform: scale(@ratio); -webkit-transform: scale(@ratio);
-ms-transform: scale(@ratio); -ms-transform: scale(@ratio); // IE9+
transform: scale(@ratio); transform: scale(@ratio);
} }
.translate(@x; @y) { .translate(@x; @y) {
-webkit-transform: translate(@x, @y); -webkit-transform: translate(@x, @y);
-ms-transform: translate(@x, @y); -ms-transform: translate(@x, @y); // IE9+
transform: translate(@x, @y); transform: translate(@x, @y);
} }
.skew(@x; @y) { .skew(@x; @y) {
-webkit-transform: skew(@x, @y); -webkit-transform: skew(@x, @y);
-ms-transform: skewX(@x) skewY(@y); // See https://github.com/twbs/bootstrap/issues/4885 -ms-transform: skewX(@x) skewY(@y); // See https://github.com/twbs/bootstrap/issues/4885; IE9+
transform: skew(@x, @y); transform: skew(@x, @y);
} }
.translate3d(@x; @y; @z) { .translate3d(@x; @y; @z) {
@ -165,12 +165,12 @@
// Background clipping // Background clipping
.background-clip(@clip) { .background-clip(@clip) {
background-clip: @clip; background-clip: @clip;
} }
// Background sizing // Background sizing
.background-size(@size) { .background-size(@size) {
background-size: @size; background-size: @size;
} }
// Box sizing // Box sizing
@ -185,7 +185,7 @@
.user-select(@select) { .user-select(@select) {
-webkit-user-select: @select; -webkit-user-select: @select;
-moz-user-select: @select; -moz-user-select: @select;
-ms-user-select: @select; -ms-user-select: @select; // IE10+
-o-user-select: @select; -o-user-select: @select;
user-select: @select; user-select: @select;
} }
@ -211,7 +211,7 @@
word-wrap: break-word; word-wrap: break-word;
-webkit-hyphens: @mode; -webkit-hyphens: @mode;
-moz-hyphens: @mode; -moz-hyphens: @mode;
-ms-hyphens: @mode; -ms-hyphens: @mode; // IE10+
-o-hyphens: @mode; -o-hyphens: @mode;
hyphens: @mode; hyphens: @mode;
} }

View File

@ -18,19 +18,13 @@
to { background-position: 0 0; } to { background-position: 0 0; }
} }
// IE9
@-ms-keyframes progress-bar-stripes {
from { background-position: 40px 0; }
to { background-position: 0 0; }
}
// Opera // Opera
@-o-keyframes progress-bar-stripes { @-o-keyframes progress-bar-stripes {
from { background-position: 0 0; } from { background-position: 0 0; }
to { background-position: 40px 0; } to { background-position: 40px 0; }
} }
// Spec // Spec and IE10+
@keyframes progress-bar-stripes { @keyframes progress-bar-stripes {
from { background-position: 40px 0; } from { background-position: 40px 0; }
to { background-position: 0 0; } to { background-position: 0 0; }