mirror of
https://github.com/tenrok/bootstrap.git
synced 2026-06-11 18:02:28 +03:00
Merge branch 'pullright' of https://github.com/liuyl/bootstrap into liuyl-pullright
Conflicts: dist/css/bootstrap.min.css
This commit is contained in:
@@ -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;
|
||||
|
||||
+2
-2
@@ -10,10 +10,10 @@
|
||||
.clearfix();
|
||||
}
|
||||
.pull-right {
|
||||
float: right;
|
||||
float: right !important;
|
||||
}
|
||||
.pull-left {
|
||||
float: left;
|
||||
float: left !important;
|
||||
}
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user