aboutsummaryrefslogtreecommitdiff
path: root/less
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2013-03-30 13:23:18 -0700
committerMark Otto <[email protected]>2013-03-30 13:23:18 -0700
commitaee25786a73820b6c502ba099c55fb4008b4bd1e (patch)
tree4d8090fee71f18822588ddc787818fe4245e3f8e /less
parent8d8f4e0cdda60172e2995cf2234ec1d272d14ae8 (diff)
downloadbootstrap-aee25786a73820b6c502ba099c55fb4008b4bd1e.tar.xz
bootstrap-aee25786a73820b6c502ba099c55fb4008b4bd1e.zip
fuck everything about .clear_float() -- restore .clearfix() as mixin
Diffstat (limited to 'less')
-rw-r--r--less/button-groups.less2
-rw-r--r--less/forms.less4
-rw-r--r--less/mixins.less6
-rw-r--r--less/navbar.less4
-rw-r--r--less/navs.less2
-rw-r--r--less/pager.less2
-rw-r--r--less/type.less2
-rw-r--r--less/utilities.less2
8 files changed, 12 insertions, 12 deletions
diff --git a/less/button-groups.less b/less/button-groups.less
index 9e6eaa496..884b0b272 100644
--- a/less/button-groups.less
+++ b/less/button-groups.less
@@ -32,7 +32,7 @@
// Optional: Group multiple button groups together for a toolbar
.btn-toolbar {
- .clear_float();
+ .clearfix();
.btn-group {
float: left;
diff --git a/less/forms.less b/less/forms.less
index 02aa4242c..ddbd19637 100644
--- a/less/forms.less
+++ b/less/forms.less
@@ -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,
diff --git a/less/mixins.less b/less/mixins.less
index 4fc2bd235..be75a2f89 100644
--- a/less/mixins.less
+++ b/less/mixins.less
@@ -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) {
diff --git a/less/navbar.less b/less/navbar.less
index ad0a6f386..e9d971da1 100644
--- a/less/navbar.less
+++ b/less/navbar.less
@@ -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;
diff --git a/less/navs.less b/less/navs.less
index 33b5ec3fe..be165e434 100644
--- a/less/navs.less
+++ b/less/navs.less
@@ -11,7 +11,7 @@
margin-bottom: 0;
padding-left: 0; // Override default ul/ol
list-style: none;
- .clear_float();
+ .clearfix();
}
.nav > li {
display: block;
diff --git a/less/pager.less b/less/pager.less
index 89ce70c29..e9f7d98e7 100644
--- a/less/pager.less
+++ b/less/pager.less
@@ -7,7 +7,7 @@
margin: @line-height-base 0;
list-style: none;
text-align: center;
- .clear_float();
+ .clearfix();
}
.pager li {
display: inline;
diff --git a/less/type.less b/less/type.less
index 6725f3902..c2f7b0735 100644
--- a/less/type.less
+++ b/less/type.less
@@ -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);
diff --git a/less/utilities.less b/less/utilities.less
index f31070710..d296b32c2 100644
--- a/less/utilities.less
+++ b/less/utilities.less
@@ -7,7 +7,7 @@
// -------------------------
.clearfix {
- .clear_float();
+ .clearfix();
}
.pull-right {
float: right;