From d48027d49567c2d38211c357d6fb8d6a5a9e8a7b Mon Sep 17 00:00:00 2001
From: Jeff Adams <jeff@tinyfly.com>
Date: Tue, 29 Nov 2011 11:12:32 -0600
Subject: add input width calculation fix from #408 to the 2.0 branch

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

(limited to 'lib/forms.less')

diff --git a/lib/forms.less b/lib/forms.less
index 39c293799..5de55e727 100644
--- a/lib/forms.less
+++ b/lib/forms.less
@@ -145,7 +145,7 @@ select:focus {
 .formColumns(@columnSpan: 1) {
   display: inline-block;
   float: none;
-  width: ((@gridColumnWidth - 10) * @columnSpan) + ((@gridColumnWidth - 10) * (@columnSpan - 1));
+  width: ((@gridColumnWidth) * @columnSpan) + (@gridGutterWidth * (@columnSpan - 1)) - 10;
   margin-left: 0;
 }
 input,
-- 
cgit v1.2.3


From 1da19bf65f9affec06ba6e1f6e5f545a8e2ea457 Mon Sep 17 00:00:00 2001
From: Jeff Adams <jeff@tinyfly.com>
Date: Tue, 29 Nov 2011 14:06:31 -0600
Subject: scope form feedback states to .control-group instead of unused
 .clearfix

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

(limited to 'lib/forms.less')

diff --git a/lib/forms.less b/lib/forms.less
index 39c293799..23cdb28c9 100644
--- a/lib/forms.less
+++ b/lib/forms.less
@@ -220,15 +220,15 @@ textarea[readonly] {
   }
 }
 // Error
-form .clearfix.error {
+.control-group.error {
   .formFieldState(#b94a48, #ee5f5b, lighten(#ee5f5b, 30%));
 }
 // Warning
-form .clearfix.warning {
+.control-group.warning {
   .formFieldState(#c09853, #ccae64, lighten(#CCAE64, 5%));
 }
 // Success
-form .clearfix.success {
+.control-group.success {
   .formFieldState(#468847, #57a957, lighten(#57a957, 30%));
 }
 
-- 
cgit v1.2.3