aboutsummaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2012-05-17 22:00:49 -0700
committerMark Otto <[email protected]>2012-05-17 22:00:49 -0700
commit78790da03c2f18912215c6dc4c19d88e636c31dd (patch)
treeed6af1d94879d7bed3b5224b4d17a65fc662fc6a /docs
parente5187e12c445fbba269c5a99f47ec2673e52969b (diff)
downloadbootstrap-78790da03c2f18912215c6dc4c19d88e636c31dd.tar.xz
bootstrap-78790da03c2f18912215c6dc4c19d88e636c31dd.zip
fix resizing issues from incorrectly changing <767px grid classes to inline-block, fix height issue on textareas
Diffstat (limited to 'docs')
-rw-r--r--docs/assets/css/bootstrap-responsive.css6
-rw-r--r--docs/assets/css/bootstrap.css4
2 files changed, 9 insertions, 1 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"],