aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2014-06-18 22:23:52 -0700
committerMark Otto <[email protected]>2014-06-18 22:23:52 -0700
commite93bf15f6076b109fb10cfad9d513d55b6f1b796 (patch)
tree11f2ae2b315e4e2581939b6197c27527a5057259
parent74982cf101a8ca8e15c04e4f873d6b56e02c6c7c (diff)
parent4c21146ce32ebdbea691484c49b2dfdd6b8efb78 (diff)
downloadbootstrap-e93bf15f6076b109fb10cfad9d513d55b6f1b796.tar.xz
bootstrap-e93bf15f6076b109fb10cfad9d513d55b6f1b796.zip
Merge branch 'master' of github.com:twbs/bootstrap
-rw-r--r--less/type.less4
-rw-r--r--less/variables.less2
2 files changed, 4 insertions, 2 deletions
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