Merge branch '2.1.2-wip' into exploratory

Conflicts:
	docs/assets/css/bootstrap-responsive.css
	docs/assets/css/bootstrap.css
	docs/components.html
	docs/templates/pages/components.mustache
	less/labels-badges.less
	less/navbar.less
	less/tables.less

6 files changed, 27 insertions, 6 deletions

diff --git a/less/dropdowns.less b/less/dropdowns.less
index e0baf42cb..bff96a981 100644
--- a/less/dropdowns.less
+++ b/less/dropdowns.less
@@ -151,7 +151,6 @@
 .dropdown-submenu {
   position: relative;
 }
-
 // Default dropdowns
 .dropdown-submenu > .dropdown-menu {
   top: 0;
@@ -195,6 +194,21 @@
   border-left-color: @dropdownLinkColorHover;
 }
 
+// Left aligned submenus
+.dropdown-submenu.pull-left {
+  // Undo the float
+  // Yes, this is awkward since .pull-left adds a float, but it sticks to our conventions elsewhere.
+  float: none;
+
+  // Positioning the submenu
+  > .dropdown-menu {
+    left: -100%;
+    margin-left: 10px;
+    -webkit-border-radius: 6px 0 6px 6px;
+       -moz-border-radius: 6px 0 6px 6px;
+            border-radius: 6px 0 6px 6px;
+  }
+}
 
 // Tweak nav headers
 // -----------------
diff --git a/less/forms.less b/less/forms.less
index c2a083c4d..19ab1158f 100644
--- a/less/forms.less
+++ b/less/forms.less
@@ -334,6 +334,11 @@ textarea[class*="span"],
 .controls-row [class*="span"] {
   float: left;
 }
+// Explicity set top padding on all checkboxes/radios, not just first-child
+.controls-row .checkbox[class*="span"],
+.controls-row .radio[class*="span"] {
+  padding-top: 5px;
+}
 
 
 
diff --git a/less/labels-badges.less b/less/labels-badges.less
index cd20bf93e..02da1654d 100644
--- a/less/labels-badges.less
+++ b/less/labels-badges.less
@@ -6,6 +6,8 @@
 // Base classes
 .label,
 .badge {
+  display: inline-block;
+  padding: 2px 4px;
   font-size: @baseFontSize * .846;
   font-weight: bold;
   line-height: 14px; // ensure proper line-height if floated
@@ -17,11 +19,11 @@
 }
 // Set unique padding and border-radii
 .label {
-  padding: 1px 4px 2px;
   border-radius: 3px;
 }
 .badge {
-  padding: 1px 9px 2px;
+  padding-left: 9px;
+  padding-right: 9px;
   border-radius: 9px;
 }
 
diff --git a/less/mixins.less b/less/mixins.less
index 13f3acbdc..8058acb01 100644
--- a/less/mixins.less
+++ b/less/mixins.less
@@ -261,6 +261,7 @@
       -ms-transform: skewX(@x) skewY(@y); // See https://github.com/twitter/bootstrap/issues/4885
        -o-transform: skew(@x, @y);
           transform: skew(@x, @y);
+  -webkit-backface-visibility: hidden; // See https://github.com/twitter/bootstrap/issues/5319
 }
 .translate3d(@x, @y, @z) {
   -webkit-transform: translate3d(@x, @y, @z);
diff --git a/less/responsive-767px-max.less b/less/responsive-767px-max.less
index 4433f5ed5..c967c517b 100644
--- a/less/responsive-767px-max.less
+++ b/less/responsive-767px-max.less
@@ -83,7 +83,8 @@
     right: 20px;
     width: auto;
     margin: 0;
-    &.fade.in { top: auto; }
+    &.fade  { top: -100px; }
+    &.fade.in { top: 20px; }
   }
 
 }
diff --git a/less/tables.less b/less/tables.less
index 1d1b2b0ec..911ef67af 100644
--- a/less/tables.less
+++ b/less/tables.less
@@ -178,8 +178,6 @@ table [class*=span] {
   margin-left: 0; // undo default grid column styles
 }
 
-
-
 // TABLE BACKGROUNDS
 // -----------------
 // Exact selectors below required to override .table-striped