rooty/Bootstrap
0
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-02-20 17:54:23 +01:00
Code Issues Actions Packages Releases Activity

Merge branch 'pullright' of https://github.com/liuyl/bootstrap into liuyl-pullright

Browse Source 
Conflicts:
	dist/css/bootstrap.min.css
This commit is contained in:
Mark Otto 2013-08-05 12:20:52 -07:00
commit 96136dbb56
6 changed files with 6 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
dist/css/bootstrap.css vendored
View File

@ -633,7 +633,6 @@ blockquote small:before {
} }
blockquote.pull-right { blockquote.pull-right {
float: right;
padding-right: 15px; padding-right: 15px;
padding-left: 0; padding-left: 0;
border-right: 5px solid #eeeeee; border-right: 5px solid #eeeeee;
@ -1636,6 +1635,7 @@ textarea.input-sm {
.form-control-static { .form-control-static {
padding-top: 6px; padding-top: 6px;
margin-bottom: 0;
} }
.help-block { .help-block {
@ -2619,10 +2619,6 @@ button.close {
border-bottom-color: #ffffff; border-bottom-color: #ffffff;
} }
.nav > .pull-right {
float: right;
}
.nav .nav-divider { .nav .nav-divider {
height: 1px; height: 1px;
margin: 9px 0; margin: 9px 0;
@ -3088,7 +3084,6 @@ button.close {
border-radius: 0; border-radius: 0;
} }
.navbar-nav.pull-right { .navbar-nav.pull-right {
float: right;
width: auto; width: auto;
} }
.navbar-toggle { .navbar-toggle {
@ -4547,11 +4542,11 @@ a.list-group-item.active > .badge,
} }
.pull-right { .pull-right {
float: right; float: right !important;
} }
.pull-left { .pull-left {
float: left; float: left !important;
} }
.hide { .hide {

2
dist/css/bootstrap.min.css vendored
View File

File diff suppressed because one or more lines are too long

1
less/navbar.less
View File

@ -318,7 +318,6 @@
} }
&.pull-right { &.pull-right {
float: right;
width: auto; width: auto;
} }
} }

6
less/navs.less
View File

@ -56,12 +56,6 @@
} }
} }
// Redeclare pull classes because of specificity
// Todo: consider making these utilities !important to avoid this bullshit
> .pull-right {
float: right;
}
// Dividers (basically an hr) within the dropdown // Dividers (basically an hr) within the dropdown
.nav-divider { .nav-divider {
.nav-divider(); .nav-divider();

1
less/type.less
View File

@ -202,7 +202,6 @@ blockquote {
// Float right with text-align: right // Float right with text-align: right
&.pull-right { &.pull-right {
float: right;
padding-right: 15px; padding-right: 15px;
padding-left: 0; padding-left: 0;
border-right: 5px solid @blockquote-border-color; border-right: 5px solid @blockquote-border-color;

4
less/utilities.less
View File

@ -10,10 +10,10 @@
.clearfix(); .clearfix();
} }
.pull-right { .pull-right {
float: right; float: right !important;
} }
.pull-left { .pull-left {
float: left; float: left !important;
} }