Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip

1 files changed, 4 insertions, 43 deletions

diff --git a/less/input-groups.less b/less/input-groups.less
index 3586beef7..79d1afcd4 100644
--- a/less/input-groups.less
+++ b/less/input-groups.less
@@ -55,15 +55,17 @@
   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;
+    line-height: @line-height-small;
   }
-  &.input-large {
+  &.input-lg {
     padding: @padding-large-vertical @padding-large-horizontal;
     font-size: @font-size-large;
     border-radius: @border-radius-large;
+    line-height: @line-height-large;
   }
 
   // Nuke default margins from checkboxes and radios to vertically center within.
@@ -113,44 +115,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, 
-.form-horizontal .radio-inline, 
-.form-horizontal .checkbox-inline {
-  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;
-  }
-}