Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
B
bootstrap
Project overview
Project overview
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Administrator
bootstrap
Commits
aee25786
Commit
aee25786
authored
Mar 30, 2013
by
Mark Otto
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fuck everything about .clear_float() -- restore .clearfix() as mixin
parent
8d8f4e0c
Changes
10
Show whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
132 additions
and
17 deletions
+132
-17
docs/assets/css/bootstrap.css
docs/assets/css/bootstrap.css
+119
-4
docs/docs.html
docs/docs.html
+1
-1
less/button-groups.less
less/button-groups.less
+1
-1
less/forms.less
less/forms.less
+2
-2
less/mixins.less
less/mixins.less
+3
-3
less/navbar.less
less/navbar.less
+2
-2
less/navs.less
less/navs.less
+1
-1
less/pager.less
less/pager.less
+1
-1
less/type.less
less/type.less
+1
-1
less/utilities.less
less/utilities.less
+1
-1
No files found.
docs/assets/css/bootstrap.css
View file @
aee25786
...
@@ -365,12 +365,12 @@ cite {
...
@@ -365,12 +365,12 @@ cite {
font-style
:
normal
;
font-style
:
normal
;
}
}
.muted
{
.
text-
muted
{
color
:
#999999
;
color
:
#999999
;
}
}
a
.muted
:hover
,
a
.
text-
muted
:hover
,
a
.muted
:focus
{
a
.
text-
muted
:focus
{
color
:
#808080
;
color
:
#808080
;
}
}
...
@@ -589,6 +589,16 @@ dd {
...
@@ -589,6 +589,16 @@ dd {
clear
:
both
;
clear
:
both
;
}
}
.dl-horizontal
:before
,
.dl-horizontal
:after
{
display
:
table
;
content
:
" "
;
}
.dl-horizontal
:after
{
clear
:
both
;
}
.dl-horizontal
dt
{
.dl-horizontal
dt
{
float
:
left
;
float
:
left
;
width
:
160px
;
width
:
160px
;
...
@@ -746,6 +756,16 @@ pre code {
...
@@ -746,6 +756,16 @@ pre code {
clear
:
both
;
clear
:
both
;
}
}
.container
:before
,
.container
:after
{
display
:
table
;
content
:
" "
;
}
.container
:after
{
clear
:
both
;
}
.row
{
.row
{
margin-right
:
-15px
;
margin-right
:
-15px
;
margin-left
:
-15px
;
margin-left
:
-15px
;
...
@@ -761,6 +781,16 @@ pre code {
...
@@ -761,6 +781,16 @@ pre code {
clear
:
both
;
clear
:
both
;
}
}
.row
:before
,
.row
:after
{
display
:
table
;
content
:
" "
;
}
.row
:after
{
clear
:
both
;
}
[
class
*=
"col-span-"
]
{
[
class
*=
"col-span-"
]
{
position
:
relative
;
position
:
relative
;
min-height
:
1px
;
min-height
:
1px
;
...
@@ -1498,6 +1528,16 @@ select:focus:invalid:focus {
...
@@ -1498,6 +1528,16 @@ select:focus:invalid:focus {
clear
:
both
;
clear
:
both
;
}
}
.form-actions
:before
,
.form-actions
:after
{
display
:
table
;
content
:
" "
;
}
.form-actions
:after
{
clear
:
both
;
}
.help-block
,
.help-block
,
.help-inline
{
.help-inline
{
color
:
#737373
;
color
:
#737373
;
...
@@ -1691,6 +1731,14 @@ select:focus:invalid:focus {
...
@@ -1691,6 +1731,14 @@ select:focus:invalid:focus {
.form-horizontal
.control-group
:after
{
.form-horizontal
.control-group
:after
{
clear
:
both
;
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
input
,
.form-horizontal
.control-group
select
,
.form-horizontal
.control-group
select
,
.form-horizontal
.control-group
textarea
{
.form-horizontal
.control-group
textarea
{
...
@@ -2763,7 +2811,6 @@ fieldset[disabled] .btn-link:focus {
...
@@ -2763,7 +2811,6 @@ fieldset[disabled] .btn-link:focus {
font-weight
:
normal
;
font-weight
:
normal
;
line-height
:
20px
;
line-height
:
20px
;
color
:
#333333
;
color
:
#333333
;
white-space
:
nowrap
;
}
}
.dropdown-menu
>
li
>
a
:hover
,
.dropdown-menu
>
li
>
a
:hover
,
...
@@ -2968,6 +3015,16 @@ button.close {
...
@@ -2968,6 +3015,16 @@ button.close {
clear
:
both
;
clear
:
both
;
}
}
.nav
:before
,
.nav
:after
{
display
:
table
;
content
:
" "
;
}
.nav
:after
{
clear
:
both
;
}
.nav
>
li
{
.nav
>
li
{
display
:
block
;
display
:
block
;
}
}
...
@@ -3126,6 +3183,16 @@ button.close {
...
@@ -3126,6 +3183,16 @@ button.close {
clear
:
both
;
clear
:
both
;
}
}
.tabbable
:before
,
.tabbable
:after
{
display
:
table
;
content
:
" "
;
}
.tabbable
:after
{
clear
:
both
;
}
.tab-content
>
.tab-pane
,
.tab-content
>
.tab-pane
,
.pill-content
>
.pill-pane
{
.pill-content
>
.pill-pane
{
display
:
none
;
display
:
none
;
...
@@ -3222,6 +3289,16 @@ button.close {
...
@@ -3222,6 +3289,16 @@ button.close {
clear
:
both
;
clear
:
both
;
}
}
.navbar
:before
,
.navbar
:after
{
display
:
table
;
content
:
" "
;
}
.navbar
:after
{
clear
:
both
;
}
.navbar
.nav
{
.navbar
.nav
{
margin-top
:
15px
;
margin-top
:
15px
;
}
}
...
@@ -3483,6 +3560,14 @@ button.close {
...
@@ -3483,6 +3560,14 @@ button.close {
.navbar
.nav
:after
{
.navbar
.nav
:after
{
clear
:
both
;
clear
:
both
;
}
}
.navbar
.nav
:before
,
.navbar
.nav
:after
{
display
:
table
;
content
:
" "
;
}
.navbar
.nav
:after
{
clear
:
both
;
}
.navbar
.nav.pull-right
{
.navbar
.nav.pull-right
{
float
:
right
;
float
:
right
;
}
}
...
@@ -3615,6 +3700,16 @@ button.close {
...
@@ -3615,6 +3700,16 @@ button.close {
clear
:
both
;
clear
:
both
;
}
}
.btn-toolbar
:before
,
.btn-toolbar
:after
{
display
:
table
;
content
:
" "
;
}
.btn-toolbar
:after
{
clear
:
both
;
}
.btn-toolbar
.btn-group
{
.btn-toolbar
.btn-group
{
float
:
left
;
float
:
left
;
}
}
...
@@ -3880,6 +3975,16 @@ button.close {
...
@@ -3880,6 +3975,16 @@ button.close {
clear
:
both
;
clear
:
both
;
}
}
.pager
:before
,
.pager
:after
{
display
:
table
;
content
:
" "
;
}
.pager
:after
{
clear
:
both
;
}
.pager
li
{
.pager
li
{
display
:
inline
;
display
:
inline
;
}
}
...
@@ -4027,6 +4132,16 @@ button.close {
...
@@ -4027,6 +4132,16 @@ button.close {
clear
:
both
;
clear
:
both
;
}
}
.modal-footer
:before
,
.modal-footer
:after
{
display
:
table
;
content
:
" "
;
}
.modal-footer
:after
{
clear
:
both
;
}
.modal-footer
.btn
+
.btn
{
.modal-footer
.btn
+
.btn
{
margin-bottom
:
0
;
margin-bottom
:
0
;
margin-left
:
5px
;
margin-left
:
5px
;
...
...
docs/docs.html
View file @
aee25786
...
@@ -388,7 +388,7 @@ title: Bootstrap Documentation
...
@@ -388,7 +388,7 @@ title: Bootstrap Documentation
margin-left: (@grid-gutter-width / -2);
margin-left: (@grid-gutter-width / -2);
margin-right: (@grid-gutter-width / -2);
margin-right: (@grid-gutter-width / -2);
// Then clear the floated columns
// Then clear the floated columns
.clear
_float
();
.clear
fix
();
}
}
// Generate the columns
// Generate the columns
...
...
less/button-groups.less
View file @
aee25786
...
@@ -32,7 +32,7 @@
...
@@ -32,7 +32,7 @@
// Optional: Group multiple button groups together for a toolbar
// Optional: Group multiple button groups together for a toolbar
.btn-toolbar {
.btn-toolbar {
.clear
_float
();
.clear
fix
();
.btn-group {
.btn-group {
float: left;
float: left;
...
...
less/forms.less
View file @
aee25786
...
@@ -343,7 +343,7 @@ select:focus:invalid {
...
@@ -343,7 +343,7 @@ select:focus:invalid {
margin-bottom: @line-height-base;
margin-bottom: @line-height-base;
background-color: @form-actions-background;
background-color: @form-actions-background;
border-top: 1px solid #e5e5e5;
border-top: 1px solid #e5e5e5;
.clear
_float
(); // Adding clearfix to allow for .pull-right button containers
.clear
fix
(); // Adding clearfix to allow for .pull-right button containers
}
}
...
@@ -517,7 +517,7 @@ select:focus:invalid {
...
@@ -517,7 +517,7 @@ select:focus:invalid {
.control-group {
.control-group {
position: relative;
position: relative;
margin-bottom: @line-height-base;
margin-bottom: @line-height-base;
.clear
_float
();
.clear
fix
();
input,
input,
select,
select,
...
...
less/mixins.less
View file @
aee25786
...
@@ -16,7 +16,7 @@
...
@@ -16,7 +16,7 @@
// that are clearfixed.
// that are clearfixed.
// 2. The use of `table` rather than `block` is only necessary if using
// 2. The use of `table` rather than `block` is only necessary if using
// `:before` to contain the top-margins of child elements.
// `:before` to contain the top-margins of child elements.
.clear
_float
() {
.clear
fix
() {
&:before,
&:before,
&:after {
&:after {
content: " "; /* 1 */
content: " "; /* 1 */
...
@@ -400,7 +400,7 @@
...
@@ -400,7 +400,7 @@
.container-fixed() {
.container-fixed() {
margin-right: auto;
margin-right: auto;
margin-left: auto;
margin-left: auto;
.clear
_float
();
.clear
fix
();
}
}
// Make a grid
// Make a grid
...
@@ -411,7 +411,7 @@
...
@@ -411,7 +411,7 @@
margin-left: (@grid-gutter-width / -2);
margin-left: (@grid-gutter-width / -2);
margin-right: (@grid-gutter-width / -2);
margin-right: (@grid-gutter-width / -2);
// Then clear the floated columns
// Then clear the floated columns
.clear
_float
();
.clear
fix
();
}
}
// Generate the columns
// Generate the columns
.make-column(@columns) {
.make-column(@columns) {
...
...
less/navbar.less
View file @
aee25786
...
@@ -9,7 +9,7 @@
...
@@ -9,7 +9,7 @@
background-color: @navbar-bg;
background-color: @navbar-bg;
border-radius: @border-radius-base;
border-radius: @border-radius-base;
// Prevent floats from breaking the navbar
// Prevent floats from breaking the navbar
.clear
_float
();
.clear
fix
();
}
}
// Navbar nav links
// Navbar nav links
...
@@ -283,7 +283,7 @@
...
@@ -283,7 +283,7 @@
.navbar .nav {
.navbar .nav {
float: left;
float: left;
margin-top: 0; // undo top margin to make nav extend full height of navbar
margin-top: 0; // undo top margin to make nav extend full height of navbar
.clear
_float
();
.clear
fix
();
&.pull-right {
&.pull-right {
float: right;
float: right;
...
...
less/navs.less
View file @
aee25786
...
@@ -11,7 +11,7 @@
...
@@ -11,7 +11,7 @@
margin-bottom: 0;
margin-bottom: 0;
padding-left: 0; // Override default ul/ol
padding-left: 0; // Override default ul/ol
list-style: none;
list-style: none;
.clear
_float
();
.clear
fix
();
}
}
.nav > li {
.nav > li {
display: block;
display: block;
...
...
less/pager.less
View file @
aee25786
...
@@ -7,7 +7,7 @@
...
@@ -7,7 +7,7 @@
margin: @line-height-base 0;
margin: @line-height-base 0;
list-style: none;
list-style: none;
text-align: center;
text-align: center;
.clear
_float
();
.clear
fix
();
}
}
.pager li {
.pager li {
display: inline;
display: inline;
...
...
less/type.less
View file @
aee25786
...
@@ -158,7 +158,7 @@ dd {
...
@@ -158,7 +158,7 @@ dd {
}
}
// Horizontal layout (like forms)
// Horizontal layout (like forms)
.dl-horizontal {
.dl-horizontal {
.clear
_float
(); // Ensure dl clears floats if empty dd elements present
.clear
fix
(); // Ensure dl clears floats if empty dd elements present
dt {
dt {
float: left;
float: left;
width: (@component-offset-horizontal - 20);
width: (@component-offset-horizontal - 20);
...
...
less/utilities.less
View file @
aee25786
...
@@ -7,7 +7,7 @@
...
@@ -7,7 +7,7 @@
// -------------------------
// -------------------------
.clearfix {
.clearfix {
.clear
_float
();
.clear
fix
();
}
}
.pull-right {
.pull-right {
float: right;
float: right;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment