mirror_css/bootstrap
1
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-08-21 04:41:36 +02:00
Code Issues Releases Wiki Activity

Fix #11400 and #11431

Browse Source
This commit is contained in:
Zlatan Vasović
2013-11-07 20:58:17 +01:00
parent 463343af63
commit aad447e290
3 changed files with 30 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
dist/css/bootstrap.css vendored
View File

@@ -4031,10 +4031,18 @@ textarea.input-group-sm > .input-group-btn > .btn {
position: relative; position: relative;
} }
.input-group-btn > .btn:not(:first-of-type):not(:last-of-type) {
border-radius: 0;
}
.input-group-btn > .btn + .btn { .input-group-btn > .btn + .btn {
margin-left: -4px; margin-left: -4px;
} }
.input-group-btn > .btn + .btn:last-of-type {
margin-left: -5px;
}
.input-group-btn > .btn:hover, .input-group-btn > .btn:hover,
.input-group-btn > .btn:active { .input-group-btn > .btn:active {
z-index: 2; z-index: 2;

2
dist/css/bootstrap.min.css vendored
View File

File diff suppressed because one or more lines are too long

14
less/input-groups.less
View File

@@ -121,16 +121,26 @@
&:last-child > .btn { &:last-child > .btn {
margin-left: -1px; margin-left: -1px;
} }
}
.input-group-btn > .btn { > .btn {
position: relative; position: relative;
&:not(:first-of-type):not(:last-of-type) {
border-radius: 0;
}
// Jankily prevent input button groups from wrapping // Jankily prevent input button groups from wrapping
+ .btn { + .btn {
margin-left: -4px; margin-left: -4px;
} }
+ .btn:last-of-type {
margin-left: -5px;
}
// Bring the "active" button to the front // Bring the "active" button to the front
&:hover, &:hover,
&:active { &:active {
z-index: 2; z-index: 2;
} }
} }
}