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

Conflicts:
	dist/css/bootstrap.min.css

4 files changed, 2 insertions, 10 deletions

diff --git a/less/navbar.less b/less/navbar.less
index 99d741790..374327f12 100644
--- a/less/navbar.less
+++ b/less/navbar.less
@@ -318,7 +318,6 @@
     }
 
     &.pull-right {
-      float: right;
       width: auto;
     }
   }
diff --git a/less/navs.less b/less/navs.less
index 437052fc2..a19e5cdfd 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 41581a66a..3fa558f7a 100644
--- a/less/type.less
+++ b/less/type.less
@@ -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;
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;
 }