aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2016-02-06 20:11:11 -0800
committerMark Otto <[email protected]>2016-02-06 20:11:11 -0800
commitcf9079ecf9f37de31f4082e13eeda790d06e971c (patch)
treec744f9684e357795117c1090e01c8da6ca946c29
parentf3802a839b7e3b0a153c1ad08122444bf17e4ecc (diff)
parenteee0a685a496e5158380e6fc841caad9d5f0f5dc (diff)
downloadbootstrap-cf9079ecf9f37de31f4082e13eeda790d06e971c.tar.xz
bootstrap-cf9079ecf9f37de31f4082e13eeda790d06e971c.zip
Merge pull request #19104 from twbs/v4-dl-row
v4: Fix row-based <dl>
-rw-r--r--docs/content/typography.md6
-rw-r--r--scss/_type.scss11
2 files changed, 14 insertions, 3 deletions
diff --git a/docs/content/typography.md b/docs/content/typography.md
index 2c0207375..0c6d53aa2 100644
--- a/docs/content/typography.md
+++ b/docs/content/typography.md
@@ -232,7 +232,7 @@ Align terms and descriptions horizontally by using our grid system's predefined
<dt class="col-sm-3">Euismod</dt>
<dd class="col-sm-9">Vestibulum id ligula porta felis euismod semper eget lacinia odio sem nec elit.</dd>
- <dd class="col-sm-9 col-sm-offset-3">Donec id elit non mi porta gravida at eget metus.</dd>
+ <dd class="col-sm-9 offset-sm-3">Donec id elit non mi porta gravida at eget metus.</dd>
<dt class="col-sm-3">Malesuada porta</dt>
<dd class="col-sm-9">Etiam porta sem malesuada magna mollis euismod.</dd>
@@ -243,8 +243,8 @@ Align terms and descriptions horizontally by using our grid system's predefined
<dt class="col-sm-3">Nesting</dt>
<dd class="col-sm-9">
<dl class="row">
- <dt class="col-sm-3">Nested definition list</dt>
- <dd class="col-sm-9">Aenean posuere, tortor sed cursus feugiat, nunc augue blandit nunc.</dd>
+ <dt class="col-sm-4">Nested definition list</dt>
+ <dd class="col-sm-8">Aenean posuere, tortor sed cursus feugiat, nunc augue blandit nunc.</dd>
</dl>
</dd>
</dl>
diff --git a/scss/_type.scss b/scss/_type.scss
index 9fe8194db..107575779 100644
--- a/scss/_type.scss
+++ b/scss/_type.scss
@@ -137,3 +137,14 @@ mark,
content: "\00A0 \2014"; // nbsp, em dash
}
}
+
+@if not $enable-flex {
+ // Clean up some horizontal `<dl>`s built with grids
+ // scss-lint:disable QualifyingElement
+ dl.row {
+ > dd + dt {
+ clear: left;
+ }
+ }
+ // scss-lint:enable QualifyingElement
+}