From ccf971d860a164e6c110bda012a7577d807ad7af Mon Sep 17 00:00:00 2001
From: Mark Otto <markdotto@gmail.com>
Date: Sat, 6 Feb 2016 20:01:37 -0800
Subject: [PATCH 1/2] Fixes #17969: Clear horizontal dls
- Using the grid classes, they still need clearfixes since rows aren't injected between them all
- Update docs to fix broken classes
---
docs/content/typography.md | 6 +++---
scss/_type.scss | 9 +++++++++
2 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/docs/content/typography.md b/docs/content/typography.md
index 2c0207375e..0c6d53aa2e 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 9fe8194db5..f29ef493d6 100644
--- a/scss/_type.scss
+++ b/scss/_type.scss
@@ -137,3 +137,12 @@ mark,
content: "\00A0 \2014"; // nbsp, em dash
}
}
+
+// Clean up some horizontal `<dl>`s built with grids
+// scss-lint:disable QualifyingElement
+dl.row {
+ > dd + dt {
+ clear: left;
+ }
+}
+// scss-lint:enable QualifyingElement
--
GitLab
From eee0a685a496e5158380e6fc841caad9d5f0f5dc Mon Sep 17 00:00:00 2001
From: Mark Otto <markdotto@gmail.com>
Date: Sat, 6 Feb 2016 20:02:39 -0800
Subject: [PATCH 2/2] only do it for non-flex version
---
scss/_type.scss | 14 ++++++++------
1 file changed, 8 insertions(+), 6 deletions(-)
diff --git a/scss/_type.scss b/scss/_type.scss
index f29ef493d6..1075757795 100644
--- a/scss/_type.scss
+++ b/scss/_type.scss
@@ -138,11 +138,13 @@ mark,
}
}
-// Clean up some horizontal `<dl>`s built with grids
-// scss-lint:disable QualifyingElement
-dl.row {
- > dd + dt {
- clear: left;
+@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
}
-// scss-lint:enable QualifyingElement
--
GitLab