Commit 4ccf088a authored by Mark Otto's avatar Mark Otto

Merge branch 'master' into pr/12813

Conflicts:
	dist/css/bootstrap.css.map
	dist/css/bootstrap.min.css
	docs/dist/css/bootstrap.css.map
	docs/dist/css/bootstrap.min.css
parents 49094844 b99be29f
...@@ -5616,6 +5616,8 @@ button.close { ...@@ -5616,6 +5616,8 @@ button.close {
} }
.clearfix:before, .clearfix:before,
.clearfix:after, .clearfix:after,
.dl-horizontal dd:before,
.dl-horizontal dd:after,
.container:before, .container:before,
.container:after, .container:after,
.container-fluid:before, .container-fluid:before,
...@@ -5646,6 +5648,7 @@ button.close { ...@@ -5646,6 +5648,7 @@ button.close {
content: " "; content: " ";
} }
.clearfix:after, .clearfix:after,
.dl-horizontal dd:after,
.container:after, .container:after,
.container-fluid:after, .container-fluid:after,
.row:after, .row:after,
......
This diff was suppressed by a .gitattributes entry.
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
This diff was suppressed by a .gitattributes entry.
This source diff could not be displayed because it is too large. You can view the blob instead.
...@@ -141,7 +141,7 @@ cite { font-style: normal; } ...@@ -141,7 +141,7 @@ cite { font-style: normal; }
// Lists // Lists
// -------------------------------------------------- // -------------------------
// Unordered and Ordered lists // Unordered and Ordered lists
ul, ul,
...@@ -195,8 +195,12 @@ dd { ...@@ -195,8 +195,12 @@ dd {
// Defaults to being stacked without any of the below styles applied, until the // Defaults to being stacked without any of the below styles applied, until the
// grid breakpoint is reached (default of ~768px). // grid breakpoint is reached (default of ~768px).
@media (min-width: @grid-float-breakpoint) { .dl-horizontal {
.dl-horizontal { dd {
&:extend(.clearfix all); // Clear the floated `dt` if an empty `dd` is present
}
@media (min-width: @grid-float-breakpoint) {
dt { dt {
float: left; float: left;
width: (@component-offset-horizontal - 20); width: (@component-offset-horizontal - 20);
...@@ -206,13 +210,13 @@ dd { ...@@ -206,13 +210,13 @@ dd {
} }
dd { dd {
margin-left: @component-offset-horizontal; margin-left: @component-offset-horizontal;
&:extend(.clearfix all); // Clear the floated `dt` if an empty `dd` is present
} }
} }
} }
// MISC
// ---- // Misc
// -------------------------
// Abbreviations and acronyms // Abbreviations and acronyms
abbr[title], abbr[title],
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment