mirrors/bootstrap
2
0
Fork 0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-05-24 14:04:09 +03:00
Code Activity

fix conflicts, add docs example for two buttons on an append

Browse Source
This commit is contained in:
Mark Otto
2012-04-07 16:44:03 -07:00
parent 1d30225e2c
commit 3ecf109835
4 changed files with 28 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
docs/assets/css/bootstrap.css
Vendored
+12 -6
View File
@@ -1048,9 +1048,10 @@ select:focus:required:invalid:focus {
.input-append .add-on,
.input-prepend .btn,
.input-append .btn {
-webkit-border-radius: 3px 0 0 3px;
-moz-border-radius: 3px 0 0 3px;
border-radius: 3px 0 0 3px;
margin-left: -1px;
-webkit-border-radius: 0;
-moz-border-radius: 0;
border-radius: 0;
}
.input-prepend .active,
.input-append .active {
@@ -1061,6 +1062,12 @@ select:focus:required:invalid:focus {
.input-prepend .btn {
margin-right: -1px;
}
.input-prepend .add-on:first-child,
.input-prepend .btn:first-child {
-webkit-border-radius: 3px 0 0 3px;
-moz-border-radius: 3px 0 0 3px;
border-radius: 3px 0 0 3px;
}
.input-append input,
.input-append select,
.input-append .uneditable-input {
@@ -1072,9 +1079,8 @@ select:focus:required:invalid:focus {
border-left-color: #eee;
border-right-color: #ccc;
}
.input-append .add-on,
.input-append .btn {
margin-left: -1px;
.input-append .add-on:last-child,
.input-append .btn:last-child {
-webkit-border-radius: 0 3px 3px 0;
-moz-border-radius: 0 3px 3px 0;
border-radius: 0 3px 3px 0;