diff options
| author | Mark Otto <[email protected]> | 2012-05-28 17:32:24 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2012-05-28 17:32:24 -0700 |
| commit | 7875e4833cb7d00db2967078fd6f51adbfd4a351 (patch) | |
| tree | aa5b3974cf324512a8358d01d101c6309de04c8c /docs | |
| parent | f53a0380885c9a5bd83aef4d17a386d99354a8f0 (diff) | |
| download | bootstrap-7875e4833cb7d00db2967078fd6f51adbfd4a351.tar.xz bootstrap-7875e4833cb7d00db2967078fd6f51adbfd4a351.zip | |
fix broken css tests, add fluid input-prepend/-append to tests, fix input-prepend/append for responsive for both fluid and fixed sizing
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/assets/css/bootstrap-responsive.css | 4 | ||||
| -rw-r--r-- | docs/assets/css/bootstrap.css | 9 |
2 files changed, 9 insertions, 4 deletions
diff --git a/docs/assets/css/bootstrap-responsive.css b/docs/assets/css/bootstrap-responsive.css index a5d9ff426..cf8aa011c 100644 --- a/docs/assets/css/bootstrap-responsive.css +++ b/docs/assets/css/bootstrap-responsive.css @@ -174,10 +174,6 @@ 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 e3708c29d..c5f52ebcf 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -982,6 +982,15 @@ textarea[class*="span"], margin-left: 0; } +.input-append input[class*="span"], +.input-append .uneditable-input[class*="span"], +.input-prepend input[class*="span"], +.input-prepend .uneditable-input[class*="span"], +.row-fluid .input-prepend [class*="span"], +.row-fluid .input-append [class*="span"] { + display: inline-block; +} + input, textarea, .uneditable-input { |