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


From 83f1a75e7a8ae4570641f1fcf88c2062373fff62 Mon Sep 17 00:00:00 2001
From: Mark Otto <otto@github.com>
Date: Sun, 11 Aug 2013 18:06:26 -0700
Subject: addressing #9189 manually, part 3: forms

---
 less/forms.less | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'less/forms.less')

diff --git a/less/forms.less b/less/forms.less
index d0211eb14..97527fdbf 100644
--- a/less/forms.less
+++ b/less/forms.less
@@ -20,7 +20,7 @@ legend {
   margin-bottom: @line-height-computed;
   font-size: (@font-size-base * 1.5);
   line-height: inherit;
-  color: @gray-dark;
+  color: @legend-color;
   border: 0;
   border-bottom: 1px solid @legend-border-color;
 }
@@ -121,7 +121,7 @@ input[type="number"] {
   padding: @padding-base-vertical @padding-base-horizontal;
   font-size: @font-size-base;
   line-height: @line-height-base;
-  color: @gray;
+  color: @input-color;
   vertical-align: middle;
   background-color: @input-bg;
   border: 1px solid @input-border;
-- 
cgit v1.2.3


From f662dff6e9c52770511e5f674579a27eeac85549 Mon Sep 17 00:00:00 2001
From: Mark Otto <otto@github.com>
Date: Mon, 12 Aug 2013 11:07:23 -0700
Subject: fixes #9382: inline forms now require use of .form-group for proper
 alignment of all form controls

---
 less/forms.less | 54 +++++++++++++++++++++++++++++++++++-------------------
 1 file changed, 35 insertions(+), 19 deletions(-)

(limited to 'less/forms.less')

diff --git a/less/forms.less b/less/forms.less
index 97527fdbf..735db0495 100644
--- a/less/forms.less
+++ b/less/forms.less
@@ -293,28 +293,44 @@ textarea {
 
 // Inline forms
 //
-// Make forms appear inline(-block).
+// Make forms appear inline(-block) by adding the `.form-inline` class. Inline
+// forms begin stacked on extra small (mobile) devices and then go inline when
+// viewports reach <768px.
+//
+// Requires wrapping inputs and labels with `.form-group` for proper display of
+// default HTML form controls and our custom form controls (e.g., input groups).
 
 .form-inline {
-  .form-control,
-  .radio,
-  .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;
+  // Kick in the inline
+  @media (min-width: @screen-tablet) {
+    // Inline-block all the things for "inline"
+    .form-group  {
+      display: inline-block;
+      margin-bottom: 0;
+      vertical-align: middle;
+    }
+
+    // Reset form control's default 100% width
+    .form-control {
+      width: auto;
+    }
+
+    // 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 {
+      display: inline-block;
+      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 eb1565681fc526c7f75b90ae3dae1d82b47eb4b6 Mon Sep 17 00:00:00 2001
From: Mark Otto <otto@github.com>
Date: Mon, 12 Aug 2013 14:52:49 -0700
Subject: fixes #9392: no need for width auto on inline/navbar form controls
 given inline-block on parent form group

---
 less/forms.less | 5 -----
 1 file changed, 5 deletions(-)

(limited to 'less/forms.less')

diff --git a/less/forms.less b/less/forms.less
index 735db0495..d78784897 100644
--- a/less/forms.less
+++ b/less/forms.less
@@ -311,11 +311,6 @@ textarea {
       vertical-align: middle;
     }
 
-    // Reset form control's default 100% width
-    .form-control {
-      width: auto;
-    }
-
     // 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).
-- 
cgit v1.2.3


From eac61de138278aa1c0d70dfed7a9515c714b6ad9 Mon Sep 17 00:00:00 2001
From: Mark Otto <otto@github.com>
Date: Mon, 12 Aug 2013 16:09:21 -0700
Subject: fix navbar form alignment of inputs by restoring inline-block

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

(limited to 'less/forms.less')

diff --git a/less/forms.less b/less/forms.less
index d78784897..af575db22 100644
--- a/less/forms.less
+++ b/less/forms.less
@@ -299,6 +299,8 @@ textarea {
 //
 // Requires wrapping inputs and labels with `.form-group` for proper display of
 // default HTML form controls and our custom form controls (e.g., input groups).
+//
+// Heads up! This is mixin-ed into `.navbar-form` in navbars.less.
 
 .form-inline {
 
@@ -311,6 +313,11 @@ textarea {
       vertical-align: middle;
     }
 
+    // In navbar-form, allow folks to *not* use `.form-group`
+    .form-control {
+      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).
-- 
cgit v1.2.3


From 6ec0fd7d43d1ab243a8796b7544a4634ef086117 Mon Sep 17 00:00:00 2001
From: ggam <ggam@brainleakage.com>
Date: Tue, 13 Aug 2013 19:06:02 +0200
Subject: Added input-size mixin

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

(limited to 'less/forms.less')

diff --git a/less/forms.less b/less/forms.less
index af575db22..18d3efb54 100644
--- a/less/forms.less
+++ b/less/forms.less
@@ -208,43 +208,13 @@ input[type="number"] {
 }
 
 
-
 // Form control sizing
-//
-// Relative text size, padding, and border-radii changes for form controls. For
-// horizontal sizing, wrap controls in the predefined grid classes. `<select>`
-// element gets special love because it's special, and that's a fact!
-
-.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-sm {
-  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;
+  .input-size(@input-height-large; @padding-large-vertical; @padding-large-horizontal; @font-size-large; @line-height-large; @border-radius-large);
 }
 
-select {
-  &.input-lg {
-    height: @input-height-large;
-    line-height: @input-height-large;
-  }
-  &.input-sm {
-    height: @input-height-small;
-    line-height: @input-height-small;
-  }
-}
-textarea {
-  &.input-lg,
-  &.input-sm {
-    height: auto;
-  }
+.input-lg {
+  .input-size(@input-height-small; @padding-small-vertical; @padding-small-horizontal; @font-size-small; @line-height-small; @border-radius-small);
 }
 
 
-- 
cgit v1.2.3


From f0ee3aaac03ca74cb19fc6d287b44bd9f0293ba0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Guillermo=20Gonz=C3=A1lez=20de=20Ag=C3=BCero?=
 <ggam@brainleakage.com>
Date: Tue, 13 Aug 2013 23:31:33 +0200
Subject: Swapped input-lg and input-sm

Fixing my own error. Thanks to @kyleledbetter for reporting.
---
 less/forms.less | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'less/forms.less')

diff --git a/less/forms.less b/less/forms.less
index 18d3efb54..a8847be2b 100644
--- a/less/forms.less
+++ b/less/forms.less
@@ -210,11 +210,11 @@ input[type="number"] {
 
 // Form control sizing
 .input-sm {
-  .input-size(@input-height-large; @padding-large-vertical; @padding-large-horizontal; @font-size-large; @line-height-large; @border-radius-large);
+  .input-size(@input-height-small; @padding-small-vertical; @padding-small-horizontal; @font-size-small; @line-height-small; @border-radius-small);
 }
 
 .input-lg {
-  .input-size(@input-height-small; @padding-small-vertical; @padding-small-horizontal; @font-size-small; @line-height-small; @border-radius-small);
+  .input-size(@input-height-large; @padding-large-vertical; @padding-large-horizontal; @font-size-large; @line-height-large; @border-radius-large);
 }
 
 
-- 
cgit v1.2.3


From e684758b55dbfe1e18f3e3aa4d5eddcfaf1bd010 Mon Sep 17 00:00:00 2001
From: Chris Rebert <code@rebertia.com>
Date: Wed, 14 Aug 2013 18:20:28 -0700
Subject: fixes #9511; set cursor:not-allowed for disabled
 buttons,checkboxes,radios

---
 less/forms.less | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

(limited to 'less/forms.less')

diff --git a/less/forms.less b/less/forms.less
index a8847be2b..adcb0dc32 100644
--- a/less/forms.less
+++ b/less/forms.less
@@ -133,7 +133,7 @@ input[type="number"] {
   .form-control-focus();
 
   // Disabled and read-only inputs
-  // Note: HTML5 says that inputs under a fieldset > legend:first-child won't be
+  // Note: HTML5 says that controls under a fieldset > legend:first-child won't be
   //   disabled if the fieldset is disabled. Due to implementation difficulty,
   //   we don't honor that edge case; we style them as disabled anyway.
   &[disabled],
@@ -207,6 +207,20 @@ input[type="number"] {
   margin-left: 10px; // space out consecutive inline controls
 }
 
+// Apply same disabled cursor tweak as for inputs
+// Note: HTML5 says that controls under a fieldset > legend:first-child won't be
+//   disabled if the fieldset is disabled. Due to implementation difficulty,
+//   we don't honor that edge case; we style them as disabled anyway.
+// Note: Neither radios nor checkboxes can be readonly.
+.radio,
+.radio-inline,
+.checkbox,
+.checkbox-inline {
+  &[disabled],
+  fieldset[disabled] & {
+    cursor: not-allowed;
+  }
+}
 
 // Form control sizing
 .input-sm {
-- 
cgit v1.2.3


From 2690a3dc3185e9666384cf6982354f0456473da7 Mon Sep 17 00:00:00 2001
From: Mark Otto <otto@github.com>
Date: Thu, 15 Aug 2013 11:52:22 -0700
Subject: Add to #9578 and fix #9614: use cursor not-allowed on radios and
 checkboxes

---
 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 adcb0dc32..c59cdd4d7 100644
--- a/less/forms.less
+++ b/less/forms.less
@@ -133,9 +133,9 @@ input[type="number"] {
   .form-control-focus();
 
   // Disabled and read-only inputs
-  // Note: HTML5 says that controls under a fieldset > legend:first-child won't be
-  //   disabled if the fieldset is disabled. Due to implementation difficulty,
-  //   we don't honor that edge case; we style them as disabled anyway.
+  // Note: HTML5 says that controls under a fieldset > legend:first-child won't
+  // be disabled if the fieldset is disabled. Due to implementation difficulty,
+  // we don't honor that edge case; we style them as disabled anyway.
   &[disabled],
   &[readonly],
   fieldset[disabled] & {
@@ -208,10 +208,10 @@ input[type="number"] {
 }
 
 // Apply same disabled cursor tweak as for inputs
-// Note: HTML5 says that controls under a fieldset > legend:first-child won't be
-//   disabled if the fieldset is disabled. Due to implementation difficulty,
-//   we don't honor that edge case; we style them as disabled anyway.
+//
 // Note: Neither radios nor checkboxes can be readonly.
+input[type="radio"],
+input[type="checkbox"],
 .radio,
 .radio-inline,
 .checkbox,
-- 
cgit v1.2.3