diff options
| author | Mark Otto <[email protected]> | 2014-06-18 22:29:37 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2014-06-18 22:29:37 -0700 |
| commit | d4eb5552b369e42026807edf469242df4ebd78ab (patch) | |
| tree | cac3cb1c60df318e9b677f7171b30d1068984e75 /less | |
| parent | 2a380f6bd8c4f96ff59de88841968fd538caf538 (diff) | |
| parent | 53d68a099d1e99499a8b473896a7035444491f36 (diff) | |
| download | bootstrap-d4eb5552b369e42026807edf469242df4ebd78ab.tar.xz bootstrap-d4eb5552b369e42026807edf469242df4ebd78ab.zip | |
Merge branch 'master' into new_striped_progress_bar_class
Diffstat (limited to 'less')
| -rw-r--r-- | less/mixins/vendor-prefixes.less | 6 | ||||
| -rw-r--r-- | less/type.less | 4 | ||||
| -rw-r--r-- | less/variables.less | 2 |
3 files changed, 7 insertions, 5 deletions
diff --git a/less/mixins/vendor-prefixes.less b/less/mixins/vendor-prefixes.less index 4418ac911..b87de9cb1 100644 --- a/less/mixins/vendor-prefixes.less +++ b/less/mixins/vendor-prefixes.less @@ -131,10 +131,10 @@ transform: scaleY(@ratio); } .skew(@x; @y) { - -webkit-transform: skew(@x, @y); + -webkit-transform: skewX(@x) skewY(@y); -ms-transform: skewX(@x) skewY(@y); // See https://github.com/twbs/bootstrap/issues/4885; IE9+ - -o-transform: skew(@x, @y); - transform: skew(@x, @y); + -o-transform: skewX(@x) skewY(@y); + transform: skewX(@x) skewY(@y); } .translate(@x; @y) { -webkit-transform: translate(@x, @y); diff --git a/less/type.less b/less/type.less index 93414474a..5eb69f3c2 100644 --- a/less/type.less +++ b/less/type.less @@ -219,13 +219,13 @@ dd { @media (min-width: @grid-float-breakpoint) { dt { float: left; - width: (@component-offset-horizontal - 20); + width: (@dl-horizontal-offset - 20); clear: left; text-align: right; .text-overflow(); } dd { - margin-left: @component-offset-horizontal; + margin-left: @dl-horizontal-offset; } } } diff --git a/less/variables.less b/less/variables.less index c6edad147..2f339fb41 100644 --- a/less/variables.less +++ b/less/variables.less @@ -836,6 +836,8 @@ @blockquote-border-color: @gray-lighter; //** Page header border color @page-header-border-color: @gray-lighter; +//** Width of horizontal description list titles +@dl-horizontal-offset: @component-offset-horizontal; //== Miscellaneous |