mirror of
https://github.com/twbs/bootstrap.git
synced 2025-02-17 14:54:30 +01:00
Merge branch 'pullright' of https://github.com/liuyl/bootstrap into liuyl-pullright
Conflicts: dist/css/bootstrap.min.css
This commit is contained in:
commit
96136dbb56
11
dist/css/bootstrap.css
vendored
11
dist/css/bootstrap.css
vendored
@ -633,7 +633,6 @@ blockquote small:before {
|
||||
}
|
||||
|
||||
blockquote.pull-right {
|
||||
float: right;
|
||||
padding-right: 15px;
|
||||
padding-left: 0;
|
||||
border-right: 5px solid #eeeeee;
|
||||
@ -1636,6 +1635,7 @@ textarea.input-sm {
|
||||
|
||||
.form-control-static {
|
||||
padding-top: 6px;
|
||||
margin-bottom: 0;
|
||||
}
|
||||
|
||||
.help-block {
|
||||
@ -2619,10 +2619,6 @@ button.close {
|
||||
border-bottom-color: #ffffff;
|
||||
}
|
||||
|
||||
.nav > .pull-right {
|
||||
float: right;
|
||||
}
|
||||
|
||||
.nav .nav-divider {
|
||||
height: 1px;
|
||||
margin: 9px 0;
|
||||
@ -3088,7 +3084,6 @@ button.close {
|
||||
border-radius: 0;
|
||||
}
|
||||
.navbar-nav.pull-right {
|
||||
float: right;
|
||||
width: auto;
|
||||
}
|
||||
.navbar-toggle {
|
||||
@ -4547,11 +4542,11 @@ a.list-group-item.active > .badge,
|
||||
}
|
||||
|
||||
.pull-right {
|
||||
float: right;
|
||||
float: right !important;
|
||||
}
|
||||
|
||||
.pull-left {
|
||||
float: left;
|
||||
float: left !important;
|
||||
}
|
||||
|
||||
.hide {
|
||||
|
2
dist/css/bootstrap.min.css
vendored
2
dist/css/bootstrap.min.css
vendored
File diff suppressed because one or more lines are too long
@ -318,7 +318,6 @@
|
||||
}
|
||||
|
||||
&.pull-right {
|
||||
float: right;
|
||||
width: auto;
|
||||
}
|
||||
}
|
||||
|
@ -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
|
||||
.nav-divider {
|
||||
.nav-divider();
|
||||
|
@ -202,7 +202,6 @@ blockquote {
|
||||
|
||||
// Float right with text-align: right
|
||||
&.pull-right {
|
||||
float: right;
|
||||
padding-right: 15px;
|
||||
padding-left: 0;
|
||||
border-right: 5px solid @blockquote-border-color;
|
||||
|
@ -10,10 +10,10 @@
|
||||
.clearfix();
|
||||
}
|
||||
.pull-right {
|
||||
float: right;
|
||||
float: right !important;
|
||||
}
|
||||
.pull-left {
|
||||
float: left;
|
||||
float: left !important;
|
||||
}
|
||||
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user