0
0
mirror of https://github.com/twbs/bootstrap.git synced 2025-02-17 14:54:30 +01:00

fuck everything about .clear_float() -- restore .clearfix() as mixin

This commit is contained in:
Mark Otto 2013-03-30 13:23:18 -07:00
parent 8d8f4e0cdd
commit aee25786a7
10 changed files with 132 additions and 17 deletions

View File

@ -365,12 +365,12 @@ cite {
font-style: normal;
}
.muted {
.text-muted {
color: #999999;
}
a.muted:hover,
a.muted:focus {
a.text-muted:hover,
a.text-muted:focus {
color: #808080;
}
@ -589,6 +589,16 @@ dd {
clear: both;
}
.dl-horizontal:before,
.dl-horizontal:after {
display: table;
content: " ";
}
.dl-horizontal:after {
clear: both;
}
.dl-horizontal dt {
float: left;
width: 160px;
@ -746,6 +756,16 @@ pre code {
clear: both;
}
.container:before,
.container:after {
display: table;
content: " ";
}
.container:after {
clear: both;
}
.row {
margin-right: -15px;
margin-left: -15px;
@ -761,6 +781,16 @@ pre code {
clear: both;
}
.row:before,
.row:after {
display: table;
content: " ";
}
.row:after {
clear: both;
}
[class*="col-span-"] {
position: relative;
min-height: 1px;
@ -1498,6 +1528,16 @@ select:focus:invalid:focus {
clear: both;
}
.form-actions:before,
.form-actions:after {
display: table;
content: " ";
}
.form-actions:after {
clear: both;
}
.help-block,
.help-inline {
color: #737373;
@ -1691,6 +1731,14 @@ select:focus:invalid:focus {
.form-horizontal .control-group:after {
clear: both;
}
.form-horizontal .control-group:before,
.form-horizontal .control-group:after {
display: table;
content: " ";
}
.form-horizontal .control-group:after {
clear: both;
}
.form-horizontal .control-group input,
.form-horizontal .control-group select,
.form-horizontal .control-group textarea {
@ -2763,7 +2811,6 @@ fieldset[disabled] .btn-link:focus {
font-weight: normal;
line-height: 20px;
color: #333333;
white-space: nowrap;
}
.dropdown-menu > li > a:hover,
@ -2968,6 +3015,16 @@ button.close {
clear: both;
}
.nav:before,
.nav:after {
display: table;
content: " ";
}
.nav:after {
clear: both;
}
.nav > li {
display: block;
}
@ -3126,6 +3183,16 @@ button.close {
clear: both;
}
.tabbable:before,
.tabbable:after {
display: table;
content: " ";
}
.tabbable:after {
clear: both;
}
.tab-content > .tab-pane,
.pill-content > .pill-pane {
display: none;
@ -3222,6 +3289,16 @@ button.close {
clear: both;
}
.navbar:before,
.navbar:after {
display: table;
content: " ";
}
.navbar:after {
clear: both;
}
.navbar .nav {
margin-top: 15px;
}
@ -3483,6 +3560,14 @@ button.close {
.navbar .nav:after {
clear: both;
}
.navbar .nav:before,
.navbar .nav:after {
display: table;
content: " ";
}
.navbar .nav:after {
clear: both;
}
.navbar .nav.pull-right {
float: right;
}
@ -3615,6 +3700,16 @@ button.close {
clear: both;
}
.btn-toolbar:before,
.btn-toolbar:after {
display: table;
content: " ";
}
.btn-toolbar:after {
clear: both;
}
.btn-toolbar .btn-group {
float: left;
}
@ -3880,6 +3975,16 @@ button.close {
clear: both;
}
.pager:before,
.pager:after {
display: table;
content: " ";
}
.pager:after {
clear: both;
}
.pager li {
display: inline;
}
@ -4027,6 +4132,16 @@ button.close {
clear: both;
}
.modal-footer:before,
.modal-footer:after {
display: table;
content: " ";
}
.modal-footer:after {
clear: both;
}
.modal-footer .btn + .btn {
margin-bottom: 0;
margin-left: 5px;

View File

@ -388,7 +388,7 @@ title: Bootstrap Documentation
margin-left: (@grid-gutter-width / -2);
margin-right: (@grid-gutter-width / -2);
// Then clear the floated columns
.clear_float();
.clearfix();
}
// Generate the columns

View File

@ -32,7 +32,7 @@
// Optional: Group multiple button groups together for a toolbar
.btn-toolbar {
.clear_float();
.clearfix();
.btn-group {
float: left;

View File

@ -343,7 +343,7 @@ select:focus:invalid {
margin-bottom: @line-height-base;
background-color: @form-actions-background;
border-top: 1px solid #e5e5e5;
.clear_float(); // Adding clearfix to allow for .pull-right button containers
.clearfix(); // Adding clearfix to allow for .pull-right button containers
}
@ -517,7 +517,7 @@ select:focus:invalid {
.control-group {
position: relative;
margin-bottom: @line-height-base;
.clear_float();
.clearfix();
input,
select,

View File

@ -16,7 +16,7 @@
// that are clearfixed.
// 2. The use of `table` rather than `block` is only necessary if using
// `:before` to contain the top-margins of child elements.
.clear_float() {
.clearfix() {
&:before,
&:after {
content: " "; /* 1 */
@ -400,7 +400,7 @@
.container-fixed() {
margin-right: auto;
margin-left: auto;
.clear_float();
.clearfix();
}
// Make a grid
@ -411,7 +411,7 @@
margin-left: (@grid-gutter-width / -2);
margin-right: (@grid-gutter-width / -2);
// Then clear the floated columns
.clear_float();
.clearfix();
}
// Generate the columns
.make-column(@columns) {

View File

@ -9,7 +9,7 @@
background-color: @navbar-bg;
border-radius: @border-radius-base;
// Prevent floats from breaking the navbar
.clear_float();
.clearfix();
}
// Navbar nav links
@ -283,7 +283,7 @@
.navbar .nav {
float: left;
margin-top: 0; // undo top margin to make nav extend full height of navbar
.clear_float();
.clearfix();
&.pull-right {
float: right;

View File

@ -11,7 +11,7 @@
margin-bottom: 0;
padding-left: 0; // Override default ul/ol
list-style: none;
.clear_float();
.clearfix();
}
.nav > li {
display: block;

View File

@ -7,7 +7,7 @@
margin: @line-height-base 0;
list-style: none;
text-align: center;
.clear_float();
.clearfix();
}
.pager li {
display: inline;

View File

@ -158,7 +158,7 @@ dd {
}
// Horizontal layout (like forms)
.dl-horizontal {
.clear_float(); // Ensure dl clears floats if empty dd elements present
.clearfix(); // Ensure dl clears floats if empty dd elements present
dt {
float: left;
width: (@component-offset-horizontal - 20);

View File

@ -7,7 +7,7 @@
// -------------------------
.clearfix {
.clear_float();
.clearfix();
}
.pull-right {
float: right;