Merge branch '2.2.2-wip' into exploratory

Conflicts:
	less/button-groups.less

4 files changed, 15 insertions, 15 deletions

diff --git a/less/button-groups.less b/less/button-groups.less
index 8a74b9e75..7b7c779ae 100644
--- a/less/button-groups.less
+++ b/less/button-groups.less
@@ -56,25 +56,25 @@
 // Set corners individual because sometimes a single button can be in a .btn-group and we need :first-child and :last-child to both match
 .btn-group > .btn:first-child {
   margin-left: 0;
-  .border-top-left-radius(4px);
-  .border-bottom-left-radius(4px);
+  .border-top-left-radius(@baseBorderRadius);
+  .border-bottom-left-radius(@baseBorderRadius);
 }
 // Need .dropdown-toggle since :last-child doesn't apply given a .dropdown-menu immediately after it
 .btn-group > .btn:last-child,
 .btn-group > .dropdown-toggle {
-  .border-top-right-radius(4px);
-  .border-bottom-right-radius(4px);
+  .border-top-right-radius(@baseBorderRadius);
+  .border-bottom-right-radius(@baseBorderRadius);
 }
 // Reset corners for large buttons
 .btn-group > .btn.large:first-child {
   margin-left: 0;
-  .border-top-left-radius(6px);
-  .border-bottom-left-radius(6px);
+  .border-top-left-radius(@borderRadiusLarge);
+  .border-bottom-left-radius(@borderRadiusLarge);
 }
 .btn-group > .btn.large:last-child,
 .btn-group > .large.dropdown-toggle {
-  .border-top-right-radius(6px);
-  .border-bottom-right-radius(6px);
+  .border-top-right-radius(@borderRadiusLarge);
+  .border-bottom-right-radius(@borderRadiusLarge);
 }
 
 // On hover/focus/active, bring the proper btn to front
@@ -200,14 +200,14 @@
   margin-top: -1px;
 }
 .btn-group-vertical .btn:first-child {
-  border-radius: 4px 4px 0 0;
+  border-radius: @baseBorderRadius @baseBorderRadius 0 0;
 }
 .btn-group-vertical .btn:last-child {
-  border-radius: 0 0 4px 4px;
+  border-radius: 0 0 @baseBorderRadius @baseBorderRadius;
 }
 .btn-group-vertical .btn-large:first-child {
-  border-radius: 6px 6px 0 0;
+  border-radius: @borderRadiusLarge @borderRadiusLarge 0 0;
 }
 .btn-group-vertical .btn-large:last-child {
-  border-radius: 0 0 6px 6px;
+  border-radius: 0 0 @borderRadiusLarge @borderRadiusLarge;
 }
diff --git a/less/mixins.less b/less/mixins.less
index d41262e07..f5edd230c 100644
--- a/less/mixins.less
+++ b/less/mixins.less
@@ -135,7 +135,7 @@
 // Mixin for form field states
 .formFieldState(@textColor: #555, @borderColor: #ccc, @backgroundColor: #f5f5f5) {
   // Set the text color
-  > label,
+  .control-label,
   .help-block,
   .help-inline {
     color: @textColor;
diff --git a/less/navbar.less b/less/navbar.less
index fa2a0e3c5..eb04a2071 100644
--- a/less/navbar.less
+++ b/less/navbar.less
@@ -112,7 +112,7 @@
   }
   .input-append,
   .input-prepend {
-    margin-top: 6px;
+    margin-top: 5px;
     white-space: nowrap; // preven two  items from separating within a .navbar-form that has .pull-left
     input {
       margin-top: 0; // remove the margin on top since it's on the parent
diff --git a/less/reset.less b/less/reset.less
index d26b2a2ae..fa0be26c0 100644
--- a/less/reset.less
+++ b/less/reset.less
@@ -1,5 +1,5 @@
 //
-// Modals
+// Reset CSS
 // Adapted from http://github.com/necolas/normalize.css
 // --------------------------------------------------