From: Mark Otto <markdotto@gmail.com>
Date: Wed, 3 Dec 2014 19:23:53 +0000 (-0800)
Subject: fix broken textarea.form-control reported by @thomas-mcdonald
X-Git-Tag: v4.0.0-alpha~533^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=bafd0b057eceae261da82e52ad78c65f08ddd166;p=thirdparty%2Fbootstrap.git

fix broken textarea.form-control reported by @thomas-mcdonald
---

diff --git a/scss/_forms.scss b/scss/_forms.scss
index 351e66a020..c380367ac1 100644
--- a/scss/_forms.scss
+++ b/scss/_forms.scss
@@ -148,13 +148,13 @@ output {
     background-color: $input-bg-disabled;
     opacity: 1; // iOS fix for unreadable disabled content
   }
+}
 
-  // Reset height for `textarea`s
-  &textarea {
-    height: auto;
-    padding-top: $padding-base-horizontal;
-    padding-bottom: $padding-base-horizontal;
-  }
+// Reset height for `textarea`s
+textarea.form-control {
+  height: auto;
+  padding-top: $padding-base-horizontal;
+  padding-bottom: $padding-base-horizontal;
 }