diff options
| author | Mark Otto <[email protected]> | 2012-01-07 01:22:52 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2012-01-07 01:22:52 -0800 |
| commit | 45d671d97f4d448780729bbb6357e9ec776f980c (patch) | |
| tree | 466c03c63b82a9ced2260a01c753b889fa48fb08 /bootstrap.css | |
| parent | e23448ab1b2cc627a3cab54406ffce6c915297b6 (diff) | |
| download | bootstrap-45d671d97f4d448780729bbb6357e9ec776f980c.tar.xz bootstrap-45d671d97f4d448780729bbb6357e9ec776f980c.zip | |
tweak spacing once more on prettify; add support for uneditable inputs to input-append and prepend
Diffstat (limited to 'bootstrap.css')
| -rw-r--r-- | bootstrap.css | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/bootstrap.css b/bootstrap.css index 38ce72cba..411bc9c43 100644 --- a/bootstrap.css +++ b/bootstrap.css @@ -6,7 +6,7 @@ * http://www.apache.org/licenses/LICENSE-2.0 * * Designed and built with all the love in the world @twitter by @mdo and @fat. - * Date: Sat Jan 7 01:08:05 PST 2012 + * Date: Sat Jan 7 01:22:18 PST 2012 */ html, body { margin: 0; @@ -678,7 +678,7 @@ input[type=file]:focus, input[type=checkbox]:focus, select:focus { input[class*="span"], select[class*="span"], textarea[class*="span"], -.uneditable-input[class*="span"] { +.uneditable-input { float: none; margin-left: 0; } @@ -871,11 +871,17 @@ input::-webkit-input-placeholder { .input-prepend:after, .input-append:after { clear: both; } -.input-prepend input, .input-append input { +.input-prepend input, +.input-append input, +.input-prepend .uneditable-input, +.input-append .uneditable-input { -webkit-border-radius: 0 3px 3px 0; -moz-border-radius: 0 3px 3px 0; border-radius: 0 3px 3px 0; } +.input-prepend .uneditable-input, .input-append .uneditable-input { + border-left-color: #ccc; +} .input-prepend .add-on, .input-append .add-on { float: left; display: block; @@ -904,12 +910,15 @@ input::-webkit-input-placeholder { /* IE6-7 */ } -.input-append input { +.input-append input, .input-append .uneditable-input { float: left; -webkit-border-radius: 3px 0 0 3px; -moz-border-radius: 3px 0 0 3px; border-radius: 3px 0 0 3px; } +.input-append .uneditable-input { + border-right-color: #ccc; +} .input-append .add-on { margin-right: 0; margin-left: -1px; |
