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

Conflicts:
	dist/css/bootstrap.min.css

dist/css/bootstrap.css

@@ -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 {

less/navbar.less

@@ -318,7 +318,6 @@
     }
 
     &.pull-right {
-      float: right;
       width: auto;
     }
   }

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();

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;

less/utilities.less

@@ -10,10 +10,10 @@
   .clearfix();
 }
 .pull-right {
-  float: right;
+  float: right !important;
 }
 .pull-left {
-  float: left;
+  float: left !important;
 }