1 files changed, 18 insertions, 44 deletions
diff --git a/less/input-groups.less b/less/input-groups.less
index fed7d5645..570f03f90 100644
--- a/less/input-groups.less
+++ b/less/input-groups.less
@@ -5,6 +5,7 @@
 // Base styles
 // -------------------------
 .input-group {
+  position: relative; // For dropdowns
   display: table;
   border-collapse: separate; // prevent input groups from inheriting border styles from table cells when placed within a table
 
@@ -21,6 +22,19 @@
   }
 }
 
+// Sizing options
+//
+// Remix the default form control sizing classes into new ones for easier
+// manipulation.
+
+.input-group-lg > .form-control,
+.input-group-lg > .input-group-addon,
+.input-group-lg > .input-group-btn > .btn { .input-lg(); }
+.input-group-sm > .form-control,
+.input-group-sm > .input-group-addon,
+.input-group-sm > .input-group-btn > .btn { .input-sm(); }
+
+
 // Display as table-cell
 // -------------------------
 .input-group-addon,
@@ -43,23 +57,22 @@
 // Text input groups
 // -------------------------
 .input-group-addon {
-  .box-sizing(border-box);
   padding: @padding-base-vertical @padding-base-horizontal;
   font-size: @font-size-base;
   font-weight: normal;
-  line-height: @line-height-base;
+  line-height: 1;
   text-align: center;
-  background-color: @gray-lighter;
+  background-color: @input-group-addon-bg;
   border: 1px solid @input-group-addon-border-color;
   border-radius: @border-radius-base;
 
   // Sizing
-  &.input-small {
+  &.input-sm {
     padding: @padding-small-vertical @padding-small-horizontal;
     font-size: @font-size-small;
     border-radius: @border-radius-small;
   }
-  &.input-large {
+  &.input-lg {
     padding: @padding-large-vertical @padding-large-horizontal;
     font-size: @font-size-large;
     border-radius: @border-radius-large;
@@ -112,42 +125,3 @@
     z-index: 2;
   }
 }
-
-
-// Inline forms
-// --------------------------------------------------
-
-.form-inline {
-  .form-control,
-  .radio,
-  .checkbox {
-    display: inline-block;
-  }
-  .radio,
-  .checkbox {
-    margin-top: 0;
-    margin-bottom: 0;
-  }
-}
-
-
-// Horizontal forms
-// --------------------------------------------------
-// Horizontal forms are built on grid classes.
-
-.form-horizontal .control-label {
-  padding-top: 9px;
-}
-
-.form-horizontal {
-  .form-group {
-    .make-row();
-  }
-}
-
-// Only right align form labels here when the columns stop stacking
-@media (min-width: @screen-tablet) {
-  .form-horizontal .control-label {
-    text-align: right;
-  }
-}