From 9435991ff0ffa79c027f12c0a08aa13376c3b2fe Mon Sep 17 00:00:00 2001
From: Mark Otto <otto@github.com>
Date: Fri, 2 Aug 2013 18:48:44 -0700
Subject: move form layouts from input groups back to forms (messed this up in
 b281ad64096d919145159ffbc4e1a5b284708d9b)

---
 less/input-groups.less | 41 -----------------------------------------
 1 file changed, 41 deletions(-)

(limited to 'less/input-groups.less')

diff --git a/less/input-groups.less b/less/input-groups.less
index 3586beef7..1a6368831 100644
--- a/less/input-groups.less
+++ b/less/input-groups.less
@@ -113,44 +113,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;
-  }
-}
-- 
cgit v1.2.3


From 4bbbf774a4b36ce5f36e4a35a2e7bed807dd640b Mon Sep 17 00:00:00 2001
From: liuyl <lyl890808@gmail.com>
Date: Sun, 4 Aug 2013 09:27:23 +0800
Subject: add line-height

---
 less/input-groups.less | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'less/input-groups.less')

diff --git a/less/input-groups.less b/less/input-groups.less
index 1a6368831..77be68d92 100644
--- a/less/input-groups.less
+++ b/less/input-groups.less
@@ -59,11 +59,13 @@
     padding: @padding-small-vertical @padding-small-horizontal;
     font-size: @font-size-small;
     border-radius: @border-radius-small;
+    line-height: @line-height-small;
   }
   &.input-large {
     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.
-- 
cgit v1.2.3


From 23ef8c0c209844dd8b92d2a5ac82daffa7bd2914 Mon Sep 17 00:00:00 2001
From: Chris Rebert <code@rebertia.com>
Date: Sat, 3 Aug 2013 21:39:57 -0700
Subject: Greater standardization of sizing terminology

In class names:
* large => lg
* small => sm
* mini => xs ("Extra small")

In screen size categories:
* Tiny => Extra small
---
 less/input-groups.less | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'less/input-groups.less')

diff --git a/less/input-groups.less b/less/input-groups.less
index 77be68d92..79d1afcd4 100644
--- a/less/input-groups.less
+++ b/less/input-groups.less
@@ -55,13 +55,13 @@
   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;
-- 
cgit v1.2.3