2
0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-06-08 17:22:31 +03:00

Merge branch 'master' into new_striped_progress_bar_class

This commit is contained in:
Mark Otto
2014-06-18 22:29:37 -07:00
17 changed files with 61 additions and 16 deletions
+3 -3
View File
@@ -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);
+2 -2
View File
@@ -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;
}
}
}
+2
View File
@@ -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