diff options
| author | Mark Otto <[email protected]> | 2012-05-17 22:00:49 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2012-05-17 22:00:49 -0700 |
| commit | 78790da03c2f18912215c6dc4c19d88e636c31dd (patch) | |
| tree | ed6af1d94879d7bed3b5224b4d17a65fc662fc6a | |
| parent | e5187e12c445fbba269c5a99f47ec2673e52969b (diff) | |
| download | bootstrap-78790da03c2f18912215c6dc4c19d88e636c31dd.tar.xz bootstrap-78790da03c2f18912215c6dc4c19d88e636c31dd.zip | |
fix resizing issues from incorrectly changing <767px grid classes to inline-block, fix height issue on textareas
| -rw-r--r-- | docs/assets/css/bootstrap-responsive.css | 6 | ||||
| -rw-r--r-- | docs/assets/css/bootstrap.css | 4 | ||||
| -rw-r--r-- | less/forms.less | 4 | ||||
| -rw-r--r-- | less/responsive-767px-max.less | 6 |
4 files changed, 18 insertions, 2 deletions
diff --git a/docs/assets/css/bootstrap-responsive.css b/docs/assets/css/bootstrap-responsive.css index 9f32f0808..a5d9ff426 100644 --- a/docs/assets/css/bootstrap-responsive.css +++ b/docs/assets/css/bootstrap-responsive.css @@ -169,11 +169,15 @@ } [class*="span"], .row-fluid [class*="span"] { - display: inline-block; + display: block; float: none; width: auto; margin-left: 0; } + .row-fluid .input-prepend [class*="span"], + .row-fluid .input-append [class*="span"] { + display: inline-block; + } .input-large, .input-xlarge, .input-xxlarge, diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 42d1907d6..549c4d37e 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -802,6 +802,10 @@ textarea { width: 210px; } +textarea { + height: auto; +} + textarea, input[type="text"], input[type="password"], diff --git a/less/forms.less b/less/forms.less index 606446638..582bb413b 100644 --- a/less/forms.less +++ b/less/forms.less @@ -94,6 +94,10 @@ input, textarea { width: 210px; } +// Reset height since textareas have rows +textarea { + height: auto; +} // Everything else textarea, input[type="text"], diff --git a/less/responsive-767px-max.less b/less/responsive-767px-max.less index e35e45d89..fc422d3a2 100644 --- a/less/responsive-767px-max.less +++ b/less/responsive-767px-max.less @@ -120,10 +120,14 @@ [class*="span"], .row-fluid [class*="span"] { float: none; - display: inline-block; + display: block; width: auto; margin-left: 0; } + .row-fluid .input-prepend [class*="span"], + .row-fluid .input-append [class*="span"] { + display: inline-block; + } // FORM FIELDS // ----------- |