kotovalexarian-likes-github
/
twbs--bootstrap
mirror of https://github.com/twbs/bootstrap.git
1
0
Fork 0
Code Releases Activity

Merge pull request #12459 from rubenstolk/hotfix/mixins/scale 

Make both .scale(X) and .scale(X, Y) both work
This commit is contained in:
Mark Otto 2014-02-21 17:36:47 -08:00
parent c7b07a5644 a843bfda18
commit b01f995ad7
1 changed files with 27 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
less/mixins.less
View File

@ -148,31 +148,45 @@
} }
// Transformations // Transformations
.rotate(@degrees) { .scale(@ratio) {
-webkit-transform: rotate(@degrees); -webkit-transform: scale(@ratio);
-ms-transform: rotate(@degrees); // IE9 only -ms-transform: scale(@ratio); // IE9 only
transform: rotate(@degrees); transform: scale(@ratio);
} }
.scale(@ratio; @ratio-y...) { .scale(@ratioX; @ratioY) {
-webkit-transform: scale(@ratio, @ratio-y); -webkit-transform: scale(@ratioX, @ratioY);
-ms-transform: scale(@ratio, @ratio-y); // IE9 only -ms-transform: scale(@ratioX, @ratioY); // IE9 only
transform: scale(@ratio, @ratio-y); transform: scale(@ratioX, @ratioY);
} }
.translate(@x; @y) { .scaleX(@ratio) {
-webkit-transform: translate(@x, @y); -webkit-transform: scaleX(@ratio);
-ms-transform: translate(@x, @y); // IE9 only -ms-transform: scaleX(@ratio); // IE9 only
transform: translate(@x, @y); transform: scaleX(@ratio);
}
.scaleY(@ratio) {
-webkit-transform: scaleY(@ratio);
-ms-transform: scaleY(@ratio); // IE9 only
transform: scaleY(@ratio);
} }
.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; IE9+ -ms-transform: skewX(@x) skewY(@y); // See https://github.com/twbs/bootstrap/issues/4885; IE9+
transform: skew(@x, @y); transform: skew(@x, @y);
} }
.translate(@x; @y) {
-webkit-transform: translate(@x, @y);
-ms-transform: translate(@x, @y); // IE9 only
transform: translate(@x, @y);
}
.translate3d(@x; @y; @z) { .translate3d(@x; @y; @z) {
-webkit-transform: translate3d(@x, @y, @z); -webkit-transform: translate3d(@x, @y, @z);
transform: translate3d(@x, @y, @z); transform: translate3d(@x, @y, @z);
} }
.rotate(@degrees) {
-webkit-transform: rotate(@degrees);
-ms-transform: rotate(@degrees); // IE9 only
transform: rotate(@degrees);
}
.rotateX(@degrees) { .rotateX(@degrees) {
-webkit-transform: rotateX(@degrees); -webkit-transform: rotateX(@degrees);
-ms-transform: rotateX(@degrees); // IE9 only -ms-transform: rotateX(@degrees); // IE9 only