Commit efac0bf8 authored by liuyl's avatar liuyl

make pull-right !important

parent c25bf6ba
...@@ -636,7 +636,6 @@ blockquote small:before { ...@@ -636,7 +636,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;
...@@ -2478,10 +2477,6 @@ button.close { ...@@ -2478,10 +2477,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;
...@@ -2938,7 +2933,6 @@ button.close { ...@@ -2938,7 +2933,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 {
...@@ -4388,11 +4382,11 @@ a.list-group-item.active > .badge, ...@@ -4388,11 +4382,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 {
......
This source diff could not be displayed because it is too large. You can view the blob instead.
...@@ -317,7 +317,6 @@ ...@@ -317,7 +317,6 @@
} }
&.pull-right { &.pull-right {
float: right;
width: auto; width: auto;
} }
} }
......
...@@ -56,12 +56,6 @@ ...@@ -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();
......
...@@ -195,7 +195,6 @@ blockquote { ...@@ -195,7 +195,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;
......
...@@ -10,10 +10,10 @@ ...@@ -10,10 +10,10 @@
.clearfix(); .clearfix();
} }
.pull-right { .pull-right {
float: right; float: right !important;
} }
.pull-left { .pull-left {
float: left; float: left !important;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment