aboutsummaryrefslogtreecommitdiff
path: root/docs/assets/css
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2012-03-11 23:21:38 -0700
committerMark Otto <[email protected]>2012-03-11 23:21:38 -0700
commit7c2ed0c0958dcdb518970617a013538310494d20 (patch)
tree48f0e67c648e92d0dfaf8d3e01a93fdb95dd83b9 /docs/assets/css
parent5eed370856424362e23b1a5e02dd3c58c83dd30f (diff)
downloadbootstrap-7c2ed0c0958dcdb518970617a013538310494d20.tar.xz
bootstrap-7c2ed0c0958dcdb518970617a013538310494d20.zip
resolve #1972, allowing add-ons at beginning and end of input-prepend/append
Diffstat (limited to 'docs/assets/css')
-rw-r--r--docs/assets/css/bootstrap.css24
1 files changed, 22 insertions, 2 deletions
diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index 433a345ab..2b2f61dea 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;