mirror of
https://github.com/tenrok/bootstrap.git
synced 2026-06-08 17:22:31 +03:00
fuck everything about .clear_float() -- restore .clearfix() as mixin
This commit is contained in:
@@ -32,7 +32,7 @@
|
||||
|
||||
// Optional: Group multiple button groups together for a toolbar
|
||||
.btn-toolbar {
|
||||
.clear_float();
|
||||
.clearfix();
|
||||
|
||||
.btn-group {
|
||||
float: left;
|
||||
|
||||
+2
-2
@@ -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,
|
||||
|
||||
+3
-3
@@ -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) {
|
||||
|
||||
+2
-2
@@ -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;
|
||||
|
||||
+1
-1
@@ -11,7 +11,7 @@
|
||||
margin-bottom: 0;
|
||||
padding-left: 0; // Override default ul/ol
|
||||
list-style: none;
|
||||
.clear_float();
|
||||
.clearfix();
|
||||
}
|
||||
.nav > li {
|
||||
display: block;
|
||||
|
||||
+1
-1
@@ -7,7 +7,7 @@
|
||||
margin: @line-height-base 0;
|
||||
list-style: none;
|
||||
text-align: center;
|
||||
.clear_float();
|
||||
.clearfix();
|
||||
}
|
||||
.pager li {
|
||||
display: inline;
|
||||
|
||||
+1
-1
@@ -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);
|
||||
|
||||
+1
-1
@@ -7,7 +7,7 @@
|
||||
// -------------------------
|
||||
|
||||
.clearfix {
|
||||
.clear_float();
|
||||
.clearfix();
|
||||
}
|
||||
.pull-right {
|
||||
float: right;
|
||||
|
||||
Reference in New Issue
Block a user