diff options
| author | Mark Otto <[email protected]> | 2014-02-21 17:36:47 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2014-02-21 17:36:47 -0800 |
| commit | b01f995ad740a92cd2851def00c1ebcd277274b3 (patch) | |
| tree | afc46b60483a4bece0f3e4d817d3697aec6fee2d | |
| parent | c7b07a56449cb6dffd1f8cea6d74b2694b022eb9 (diff) | |
| parent | a843bfda18d1a9c0eabffdcf0900b957aef7d5cd (diff) | |
| download | bootstrap-b01f995ad740a92cd2851def00c1ebcd277274b3.tar.xz bootstrap-b01f995ad740a92cd2851def00c1ebcd277274b3.zip | |
Merge pull request #12459 from rubenstolk/hotfix/mixins/scale
Make both .scale(X) and .scale(X, Y) both work
| -rw-r--r-- | less/mixins.less | 42 |
1 files changed, 28 insertions, 14 deletions
diff --git a/less/mixins.less b/less/mixins.less index 71723dba4..33117f2ce 100644 --- a/less/mixins.less +++ b/less/mixins.less @@ -148,31 +148,45 @@ } // Transformations -.rotate(@degrees) { - -webkit-transform: rotate(@degrees); - -ms-transform: rotate(@degrees); // IE9 only - transform: rotate(@degrees); +.scale(@ratio) { + -webkit-transform: scale(@ratio); + -ms-transform: scale(@ratio); // IE9 only + transform: scale(@ratio); +} +.scale(@ratioX; @ratioY) { + -webkit-transform: scale(@ratioX, @ratioY); + -ms-transform: scale(@ratioX, @ratioY); // IE9 only + transform: scale(@ratioX, @ratioY); +} +.scaleX(@ratio) { + -webkit-transform: scaleX(@ratio); + -ms-transform: scaleX(@ratio); // IE9 only + transform: scaleX(@ratio); +} +.scaleY(@ratio) { + -webkit-transform: scaleY(@ratio); + -ms-transform: scaleY(@ratio); // IE9 only + transform: scaleY(@ratio); } -.scale(@ratio; @ratio-y...) { - -webkit-transform: scale(@ratio, @ratio-y); - -ms-transform: scale(@ratio, @ratio-y); // IE9 only - transform: scale(@ratio, @ratio-y); +.skew(@x; @y) { + -webkit-transform: skew(@x, @y); + -ms-transform: skewX(@x) skewY(@y); // See https://github.com/twbs/bootstrap/issues/4885; IE9+ + transform: skew(@x, @y); } .translate(@x; @y) { -webkit-transform: translate(@x, @y); -ms-transform: translate(@x, @y); // IE9 only transform: translate(@x, @y); } -.skew(@x; @y) { - -webkit-transform: skew(@x, @y); - -ms-transform: skewX(@x) skewY(@y); // See https://github.com/twbs/bootstrap/issues/4885; IE9+ - transform: skew(@x, @y); -} .translate3d(@x; @y; @z) { -webkit-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) { -webkit-transform: rotateX(@degrees); -ms-transform: rotateX(@degrees); // IE9 only |