diff options
| author | liuyl <[email protected]> | 2013-07-28 14:05:47 +0800 |
|---|---|---|
| committer | liuyl <[email protected]> | 2013-07-28 14:05:47 +0800 |
| commit | efac0bf8d6cda1e6af85fb84d30d673c8e0a2ee8 (patch) | |
| tree | d25b217bb814cdb8da73848df6736be2a0dcca09 /less | |
| parent | c25bf6ba460125f7a99e0867062eceb2bc1dc9f5 (diff) | |
| download | bootstrap-efac0bf8d6cda1e6af85fb84d30d673c8e0a2ee8.tar.xz bootstrap-efac0bf8d6cda1e6af85fb84d30d673c8e0a2ee8.zip | |
make pull-right !important
Diffstat (limited to 'less')
| -rw-r--r-- | less/navbar.less | 1 | ||||
| -rw-r--r-- | less/navs.less | 6 | ||||
| -rw-r--r-- | less/type.less | 1 | ||||
| -rw-r--r-- | less/utilities.less | 4 |
4 files changed, 2 insertions, 10 deletions
diff --git a/less/navbar.less b/less/navbar.less index 653a8d6d9..05077827c 100644 --- a/less/navbar.less +++ b/less/navbar.less @@ -317,7 +317,6 @@ } &.pull-right { - float: right; width: auto; } } diff --git a/less/navs.less b/less/navs.less index 4cbc98766..8600a752e 100644 --- a/less/navs.less +++ b/less/navs.less @@ -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(); diff --git a/less/type.less b/less/type.less index 0acb7f35d..ba0a33692 100644 --- a/less/type.less +++ b/less/type.less @@ -195,7 +195,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; diff --git a/less/utilities.less b/less/utilities.less index d296b32c2..3d310e651 100644 --- a/less/utilities.less +++ b/less/utilities.less @@ -10,10 +10,10 @@ .clearfix(); } .pull-right { - float: right; + float: right !important; } .pull-left { - float: left; + float: left !important; } |