diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip
index 0781da0911..7ecbbc1ab2 100644
Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ
diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index 555db1cb5b..6816158678 100644
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -400,10 +400,20 @@ dt, dd {
}
dt {
font-weight: bold;
+ line-height: 17px;
}
dd {
margin-left: 9px;
}
+.dl-horizontal dt {
+ float: left;
+ clear: left;
+ width: 120px;
+ text-align: right;
+}
+.dl-horizontal dd {
+ margin-left: 130px;
+}
hr {
margin: 18px 0;
border: 0;
diff --git a/docs/base-css.html b/docs/base-css.html
index 95b490682a..0f720d2cf4 100644
--- a/docs/base-css.html
+++ b/docs/base-css.html
@@ -288,7 +288,7 @@
Lists
-
Unordered
+
Unordered
<ul>
- Lorem ipsum dolor sit amet
@@ -309,7 +309,7 @@
-
Unstyled
+
Unstyled
<ul class="unstyled">
- Lorem ipsum dolor sit amet
@@ -330,7 +330,7 @@
-
Ordered
+
Ordered
<ol>
- Lorem ipsum dolor sit amet
@@ -344,9 +344,10 @@
+
-
Description
+
Description
<dl>
- Description lists
@@ -359,9 +360,9 @@
-
Horizontal
-
<dl class="horizontal">
-
+ Horizontal description
+ <dl class="dl-horizontal">
+
- Description lists
- A description list is perfect for defining terms.
- Euismod
diff --git a/docs/templates/pages/base-css.mustache b/docs/templates/pages/base-css.mustache
index 382b5e7ae1..4173240996 100644
--- a/docs/templates/pages/base-css.mustache
+++ b/docs/templates/pages/base-css.mustache
@@ -212,7 +212,7 @@
{{_i}}Lists{{/i}}
-
{{_i}}Unordered{{/i}}
+
{{_i}}Unordered{{/i}}
<ul>
- Lorem ipsum dolor sit amet
@@ -233,7 +233,7 @@
-
{{_i}}Unstyled{{/i}}
+
{{_i}}Unstyled{{/i}}
<ul class="unstyled">
- Lorem ipsum dolor sit amet
@@ -254,7 +254,7 @@
-
{{_i}}Ordered{{/i}}
+
{{_i}}Ordered{{/i}}
<ol>
- Lorem ipsum dolor sit amet
@@ -268,9 +268,10 @@
+
-
{{_i}}Description{{/i}}
+
{{_i}}Description{{/i}}
<dl>
- {{_i}}Description lists{{/i}}
@@ -282,10 +283,10 @@
- Etiam porta sem malesuada magna mollis euismod.
-
-
{{_i}}Horizontal{{/i}}
-
<dl class="horizontal">
-
+
+
{{_i}}Horizontal description{{/i}}
+
<dl class="dl-horizontal">
+
- {{_i}}Description lists{{/i}}
- {{_i}}A description list is perfect for defining terms.{{/i}}
- Euismod
@@ -295,12 +296,7 @@
- Etiam porta sem malesuada magna mollis euismod.
-
-
-
{{_i}}Horizontal description lists have two additional sizes: .horizontal-small
and .horizontal-large
.{{/i}}
-
-
-
+
diff --git a/less/type.less b/less/type.less
index 2a4757edaf..5a0473e769 100644
--- a/less/type.less
+++ b/less/type.less
@@ -126,12 +126,13 @@ dd {
}
dt {
font-weight: bold;
+ line-height: @baseLineHeight - 1; // fix jank Helvetica Neue font bug
}
dd {
margin-left: @baseLineHeight / 2;
}
// Horizontal layout (like forms)
-dl.horizontal {
+.dl-horizontal {
dt {
float: left;
clear: left;
@@ -141,17 +142,6 @@ dl.horizontal {
dd {
margin-left: 130px;
}
- &.horizontal-small {
- dt { width: 50px; }
- dd { margin-left: 60px; }
- }
- &.horizontal-normal {
- // no additional styles needed
- }
- &.horizontal-large {
- dt { width: 190px; }
- dd { margin-left: 200px; }
- }
}
// MISC