diff options
author | Mark Otto <markotto@twitter.com> | 2012-03-12 10:21:38 +0400 |
---|---|---|
committer | Mark Otto <markotto@twitter.com> | 2012-03-12 10:21:38 +0400 |
commit | 7c2ed0c0958dcdb518970617a013538310494d20 (patch) | |
tree | 48f0e67c648e92d0dfaf8d3e01a93fdb95dd83b9 /docs | |
parent | 5eed370856424362e23b1a5e02dd3c58c83dd30f (diff) |
resolve #1972, allowing add-ons at beginning and end of input-prepend/append
Diffstat (limited to 'docs')
-rw-r--r-- | docs/assets/bootstrap.zip | bin | 55304 -> 55388 bytes | |||
-rw-r--r-- | docs/assets/css/bootstrap.css | 24 |
2 files changed, 22 insertions, 2 deletions
diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip Binary files differindex 17f272fc5a..e6a3da31cf 100644 --- a/docs/assets/bootstrap.zip +++ b/docs/assets/bootstrap.zip diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 433a345abb..2b2f61dea3 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -1013,7 +1013,6 @@ select:focus:required:invalid:focus { width: auto; min-width: 16px; height: 18px; - margin-right: -1px; padding: 4px 5px; font-weight: normal; line-height: 18px; @@ -1031,6 +1030,9 @@ select:focus:required:invalid:focus { background-color: #a9dba9; border-color: #46a546; } +.input-prepend .add-on { + margin-right: -1px; +} .input-append input, .input-append select .uneditable-input { -webkit-border-radius: 3px 0 0 3px; @@ -1042,7 +1044,25 @@ select:focus:required:invalid:focus { border-right-color: #ccc; } .input-append .add-on { - margin-right: 0; + margin-left: -1px; + -webkit-border-radius: 0 3px 3px 0; + -moz-border-radius: 0 3px 3px 0; + border-radius: 0 3px 3px 0; +} +.input-prepend.input-append input, +.input-prepend.input-append select, +.input-prepend.input-append .uneditable-input { + -webkit-border-radius: 0; + -moz-border-radius: 0; + border-radius: 0; +} +.input-prepend.input-append .add-on:first-child { + margin-right: -1px; + -webkit-border-radius: 3px 0 0 3px; + -moz-border-radius: 3px 0 0 3px; + border-radius: 3px 0 0 3px; +} +.input-prepend.input-append .add-on:last-child { margin-left: -1px; -webkit-border-radius: 0 3px 3px 0; -moz-border-radius: 0 3px 3px 0; |