Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix segmented buttons double border #11817

Merged
merged 1 commit into from
Dec 15, 2013
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion dist/css/bootstrap.css
Original file line number Diff line number Diff line change
Expand Up @@ -3301,6 +3301,7 @@ textarea.input-group-sm > .input-group-btn > .btn {
}
.input-group-btn {
position: relative;
font-size: 0;
white-space: nowrap;
}
.input-group-btn:first-child > .btn {
Expand All @@ -3313,7 +3314,7 @@ textarea.input-group-sm > .input-group-btn > .btn {
position: relative;
}
.input-group-btn > .btn + .btn {
margin-left: -4px;
margin-left: -1px;
}
.input-group-btn > .btn:hover,
.input-group-btn > .btn:active {
Expand Down
2 changes: 1 addition & 1 deletion dist/css/bootstrap.min.css

Large diffs are not rendered by default.

6 changes: 4 additions & 2 deletions less/input-groups.less
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,10 @@
// -------------------------
.input-group-btn {
position: relative;
// Jankily prevent input button groups from wrapping
white-space: nowrap;
// in combination with inline-blocks and nowrap, space characters would take visible space
font-size: 0;

// Negative margin to only have a 1px border between the two
&:first-child > .btn {
Expand All @@ -124,9 +127,8 @@
}
.input-group-btn > .btn {
position: relative;
// Jankily prevent input button groups from wrapping
+ .btn {
margin-left: -4px;
margin-left: -1px;
}
// Bring the "active" button to the front
&:hover,
Expand Down