From f4087df47e6347a2f28b44a18914cfebf1cc3a9c Mon Sep 17 00:00:00 2001
From: XhmikosR <xhmikosr@users.sourceforge.net>
Date: Fri, 6 Dec 2013 12:42:21 +0200
Subject: Remove incompatible properties.

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

(limited to 'less/forms.less')

diff --git a/less/forms.less b/less/forms.less
index dc425ecc1..81840d158 100644
--- a/less/forms.less
+++ b/less/forms.less
@@ -89,7 +89,6 @@ output {
   font-size: @font-size-base;
   line-height: @line-height-base;
   color: @input-color;
-  vertical-align: middle;
 }
 
 
@@ -123,7 +122,6 @@ output {
   font-size: @font-size-base;
   line-height: @line-height-base;
   color: @input-color;
-  vertical-align: middle;
   background-color: @input-bg;
   background-image: none; // Reset unusual Firefox-on-Android default style; see https://github.com/necolas/normalize.css/issues/214
   border: 1px solid @input-border;
@@ -179,10 +177,8 @@ output {
   margin-top: 10px;
   margin-bottom: 10px;
   padding-left: 20px;
-  vertical-align: middle;
   label {
     display: inline;
-    margin-bottom: 0;
     font-weight: normal;
     cursor: pointer;
   }
-- 
cgit v1.2.3


From b5008ebf9ca1c9c90a6ec73ae12e55a8f155017f Mon Sep 17 00:00:00 2001
From: Mark Otto <otto@github.com>
Date: Sun, 8 Dec 2013 01:59:44 -0800
Subject: add vertical-align back to where it's necessary since we reset from
 block to inline-block on several inputs

---
 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 81840d158..50df399e3 100644
--- a/less/forms.less
+++ b/less/forms.less
@@ -303,6 +303,7 @@ input[type="checkbox"],
     // In navbar-form, allow folks to *not* use `.form-group`
     .form-control {
       display: inline-block;
+      vertical-align: middle;
     }
 
     // Override `width: 100%;` when not within a `.form-group`
@@ -319,6 +320,7 @@ input[type="checkbox"],
       margin-top: 0;
       margin-bottom: 0;
       padding-left: 0;
+      vertical-align: middle;
     }
     .radio input[type="radio"],
     .checkbox input[type="checkbox"] {
-- 
cgit v1.2.3


From ab29b1a3352e89fe8756a34e49a38341edd06844 Mon Sep 17 00:00:00 2001
From: Chris Rebert <code@rebertia.com>
Date: Mon, 9 Dec 2013 16:12:41 -0800
Subject: misc strictMath compliance fixes

---
 less/forms.less | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'less/forms.less')

diff --git a/less/forms.less b/less/forms.less
index 50df399e3..f7fc5d66c 100644
--- a/less/forms.less
+++ b/less/forms.less
@@ -352,7 +352,7 @@ input[type="checkbox"],
   // and other content below items
   .radio,
   .checkbox {
-    min-height: @line-height-computed + (@padding-base-vertical + 1);
+    min-height: (@line-height-computed + (@padding-base-vertical + 1));
   }
 
   // Make form groups behave like rows
-- 
cgit v1.2.3