diff --git a/docs/assets/css/bootstrap-responsive.css b/docs/assets/css/bootstrap-responsive.css index 0161885af3..f1efde190e 100644 --- a/docs/assets/css/bootstrap-responsive.css +++ b/docs/assets/css/bootstrap-responsive.css @@ -820,6 +820,7 @@ margin-left: 0; } [class*="span"], + .uneditable-input[class*="span"], .row-fluid [class*="span"] { display: block; float: none; diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index fe577b8da1..4e533b2523 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -992,6 +992,7 @@ input[type="color"], font-size: 14px; line-height: 20px; color: #555555; + vertical-align: middle; -webkit-border-radius: 4px; -moz-border-radius: 4px; border-radius: 4px; diff --git a/less/forms.less b/less/forms.less index c155fc0041..c9fafec274 100644 --- a/less/forms.less +++ b/less/forms.less @@ -86,6 +86,7 @@ input[type="color"], line-height: @baseLineHeight; color: @gray; .border-radius(@inputBorderRadius); + vertical-align: middle; } // Reset appearance properties for textual inputs and textarea diff --git a/less/responsive-767px-max.less b/less/responsive-767px-max.less index 5cd89e4035..45ce4ebc77 100644 --- a/less/responsive-767px-max.less +++ b/less/responsive-767px-max.less @@ -58,6 +58,7 @@ } // Make all grid-sized elements block level again [class*="span"], + .uneditable-input[class*="span"], // Makes uneditable inputs full-width when using grid sizing .row-fluid [class*="span"] { float: none; display: block; diff --git a/less/tests/forms-responsive.html b/less/tests/forms-responsive.html new file mode 100644 index 0000000000..846d5b43d5 --- /dev/null +++ b/less/tests/forms-responsive.html @@ -0,0 +1,71 @@ + + + + + Bootstrap, from Twitter + + + + + + + + + + + + + + + + + + + + + + +
+ + + +

Vertical alignment

+ + + span1 + +

Width across elements

+
+ +
+
+ +
+
+ span2 +
+ + + + +
+ + + span1 +
+ +
+ + +