From c017e19ed236c1e2f6d3818e080f2a03ef4f947b Mon Sep 17 00:00:00 2001
From: Jon Schlinkert <dev@sellside.com>
Date: Fri, 2 Aug 2013 15:31:13 -0400
Subject: Resolves https://github.com/twbs/bootstrap/issues/9014. updates
 mixins to consistently use semicolons as argument separator. Rebuild to
 confirm, no diff in compiled CSS.

---
 less/forms.less | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'less/forms.less')

diff --git a/less/forms.less b/less/forms.less
index f4e8c996d..fc5585928 100644
--- a/less/forms.less
+++ b/less/forms.less
@@ -255,15 +255,15 @@ textarea {
 
 // Warning
 .has-warning {
-  .form-control-validation(@state-warning-text, @state-warning-text, @state-warning-bg);
+  .form-control-validation(@state-warning-text; @state-warning-text; @state-warning-bg);
 }
 // Error
 .has-error {
-  .form-control-validation(@state-danger-text, @state-danger-text, @state-danger-bg);
+  .form-control-validation(@state-danger-text; @state-danger-text; @state-danger-bg);
 }
 // Success
 .has-success {
-  .form-control-validation(@state-success-text, @state-success-text, @state-success-bg);
+  .form-control-validation(@state-success-text; @state-success-text; @state-success-bg);
 }
 
 
-- 
cgit v1.2.3


From 173dac4e54281312ebb7ff993df20caffbc56840 Mon Sep 17 00:00:00 2001
From: Mark Otto <otto@github.com>
Date: Fri, 2 Aug 2013 15:09:48 -0700
Subject: Tighten up buttons and form controls

* Smaller padding on buttons and large buttons
* Same with inputs and large inputs
* Remove about 10px from height of large inputs/buttons and 4px from
regular ones

Fixes #8707 and #8700.

(Also relevant: #8711)
---
 less/forms.less | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'less/forms.less')

diff --git a/less/forms.less b/less/forms.less
index fc5585928..494d328c0 100644
--- a/less/forms.less
+++ b/less/forms.less
@@ -222,12 +222,14 @@ input[type="number"] {
   height: @input-height-large;
   padding: @padding-large-vertical @padding-large-horizontal;
   font-size: @font-size-large;
+  line-height: @line-height-large;
   border-radius: @border-radius-large;
 }
 .input-small {
   height: @input-height-small;
   padding: @padding-small-vertical @padding-small-horizontal;
   font-size: @font-size-small;
+  line-height: @line-height-small;
   border-radius: @border-radius-small;
 }
 
-- 
cgit v1.2.3


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/forms.less | 44 ++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 44 insertions(+)

(limited to 'less/forms.less')

diff --git a/less/forms.less b/less/forms.less
index 494d328c0..41d50a5e0 100644
--- a/less/forms.less
+++ b/less/forms.less
@@ -280,3 +280,47 @@ textarea {
   margin-bottom: 10px;
   color: lighten(@text-color, 25%); // lighten the text some for contrast
 }
+
+
+
+// Inline forms
+//
+// Make forms appear inline(-block).
+
+.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 and allow you to create forms with
+// labels on the left and inputs on the right.
+
+.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 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/forms.less | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'less/forms.less')

diff --git a/less/forms.less b/less/forms.less
index 41d50a5e0..127f6a67a 100644
--- a/less/forms.less
+++ b/less/forms.less
@@ -218,14 +218,14 @@ input[type="number"] {
 // horizontal sizing, wrap controls in the predefined grid classes. `<select>`
 // element gets special love because it's special, and that's a fact!
 
-.input-large {
+.input-lg {
   height: @input-height-large;
   padding: @padding-large-vertical @padding-large-horizontal;
   font-size: @font-size-large;
   line-height: @line-height-large;
   border-radius: @border-radius-large;
 }
-.input-small {
+.input-sm {
   height: @input-height-small;
   padding: @padding-small-vertical @padding-small-horizontal;
   font-size: @font-size-small;
@@ -234,18 +234,18 @@ input[type="number"] {
 }
 
 select {
-  &.input-large {
+  &.input-lg {
     height: @input-height-large;
     line-height: @input-height-large;
   }
-  &.input-small {
+  &.input-sm {
     height: @input-height-small;
     line-height: @input-height-small;
   }
 }
 textarea {
-  &.input-large,
-  &.input-small {
+  &.input-lg,
+  &.input-sm {
     height: auto;
   }
 }
-- 
cgit v1.2.3


From 73c048578dfce7c6d4e8c9d4fe6c6bd22b2ff9b2 Mon Sep 17 00:00:00 2001
From: Mark Otto <otto@github.com>
Date: Sun, 4 Aug 2013 23:05:54 -0700
Subject: Enable input focus state customization
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Add new mixin to generate and customize focus state as needed
- Adds variable to set default color
- Include clear disclaimer about customizing this—it's about users', so
don't go making everything bright red and expect them not to be
confused or alarmed.

Relevant issues: #2742, #4185, #7942, #8171, #8610, #9044
---
 less/forms.less | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

(limited to 'less/forms.less')

diff --git a/less/forms.less b/less/forms.less
index 127f6a67a..027131b3b 100644
--- a/less/forms.less
+++ b/less/forms.less
@@ -129,11 +129,8 @@ input[type="number"] {
   .box-shadow(inset 0 1px 1px rgba(0,0,0,.075));
   .transition(~"border-color ease-in-out .15s, box-shadow ease-in-out .15s");
 
-  &:focus {
-    border-color: rgba(82,168,236,.8);
-    outline: 0;
-    .box-shadow(~"inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6)");
-  }
+  // Customize the `:focus` state to imitate native WebKit styles.
+  .form-control-focus();
 
   // Disabled and read-only inputs
   // Note: HTML5 says that inputs under a fieldset > legend:first-child won't be
-- 
cgit v1.2.3


From a82ca0f9e1711b32f7c07e23ea1e23dd253cd21e Mon Sep 17 00:00:00 2001
From: Mark Otto <otto@github.com>
Date: Mon, 5 Aug 2013 11:47:12 -0700
Subject: Fixes #8795, a reoccurence of #1969

---
 less/forms.less | 10 ++++++++++
 1 file changed, 10 insertions(+)

(limited to 'less/forms.less')

diff --git a/less/forms.less b/less/forms.less
index 027131b3b..5b80d6046 100644
--- a/less/forms.less
+++ b/less/forms.less
@@ -290,10 +290,20 @@ textarea {
   .checkbox {
     display: inline-block;
   }
+
+  // Remove default margin on radios/checkboxes that were used for stacking, and
+  // then undo the floating of radios and checkboxes to match (which also avoids
+  // a bug in WebKit: https://github.com/twbs/bootstrap/issues/1969).
   .radio,
   .checkbox {
     margin-top: 0;
     margin-bottom: 0;
+    padding-left: 0;
+  }
+  .radio input[type="radio"],
+  .checkbox input[type="checkbox"] {
+    float: none;
+    margin-left: 0;
   }
 }
 
-- 
cgit v1.2.3


From e23906facaa63fcc97bddbd0895c301699c9e942 Mon Sep 17 00:00:00 2001
From: Mark Otto <otto@github.com>
Date: Mon, 5 Aug 2013 12:17:09 -0700
Subject: Fixes #8150: add `.static-form-control` for vertical alignment of
 static form text

- Also fixes the vertical alignment of labels in horizontal layouts on
account of the recent button and input padding changes
- Also changes the vertical alignment of the checkboxes and radios in
horizontal forms
---
 less/forms.less | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

(limited to 'less/forms.less')

diff --git a/less/forms.less b/less/forms.less
index 5b80d6046..d0211eb14 100644
--- a/less/forms.less
+++ b/less/forms.less
@@ -266,6 +266,17 @@ textarea {
 }
 
 
+// Static form control text
+//
+// Apply class to a `p` element to make any string of text align with labels in
+// a horizontal form layout.
+
+.form-control-static {
+  margin-bottom: 0; // Remove default margin from `p`
+  padding-top: @padding-base-vertical;
+}
+
+
 // Help text
 //
 // Apply to any element you wish to create light text for placement immediately
@@ -316,7 +327,7 @@ textarea {
 .form-horizontal .control-label,
 .form-horizontal .radio-inline,
 .form-horizontal .checkbox-inline {
-  padding-top: 9px;
+  padding-top: @padding-base-vertical;
 }
 
 .form-horizontal {
-- 
cgit v1.2.3