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.

Sign up for GitHub

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

Jump to bottom

Clean up button group #25073

Merged
merged 2 commits into from Dec 27, 2017
Merged

Clean up button group #25073

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
85debcb
Remove unnecessary float
ysds Dec 25, 2017
ea4b82c
Cleanup of reset rounded corners
ysds Dec 25, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
70 changes: 12 additions & 58 deletions scss/_button-group.scss
View file
Open in desktop
Expand Up @@ -44,46 +44,18 @@
}

.btn-group {
> .btn:not(:first-child):not(:last-child):not(.dropdown-toggle) {
border-radius: 0;
}

// Set corners individual because sometimes a single button can be in a .btn-group
// and we need :first-child and :last-child to both match
> .btn:first-child {
margin-left: 0;

&:not(:last-child):not(.dropdown-toggle) {
@include border-right-radius(0);
}
}


// Need .dropdown-toggle since :last-child doesn't apply given a .dropdown-menu
// immediately after it
> .btn:last-child:not(:first-child),
> .dropdown-toggle:not(:first-child) {
@include border-left-radius(0);
}

// Custom edits for including btn-groups within btn-groups (useful for including
// dropdown buttons within a btn-group)
> .btn-group {
float: left;
}

> .btn-group:not(:first-child):not(:last-child) > .btn {
border-radius: 0;
}

> .btn-group:first-child:not(:last-child) {
> .btn:last-child,
> .dropdown-toggle {
@include border-right-radius(0);
}
// Reset rounded corners
> .btn:not(:last-child):not(.dropdown-toggle),
> .btn-group:not(:last-child) > .btn {
@include border-right-radius(0);
}

> .btn-group:last-child:not(:first-child) > .btn:first-child {
> .btn:not(:first-child),
> .btn-group:not(:first-child) > .btn {
@include border-left-radius(0);
}
}
Expand Down Expand Up @@ -154,32 +126,14 @@
margin-left: 0;
}

> .btn {
&:not(:first-child):not(:last-child) {
border-radius: 0;
}

&:first-child:not(:last-child) {
@include border-bottom-radius(0);
}

&:last-child:not(:first-child) {
@include border-top-radius(0);
}
}

> .btn-group:not(:first-child):not(:last-child) > .btn {
border-radius: 0;
}

> .btn-group:first-child:not(:last-child) {
> .btn:last-child,
> .dropdown-toggle {
@include border-bottom-radius(0);
}
// Reset rounded corners
> .btn:not(:last-child):not(.dropdown-toggle),
> .btn-group:not(:last-child) > .btn {
@include border-bottom-radius(0);
}

> .btn-group:last-child:not(:first-child) > .btn:first-child {
> .btn:not(:first-child),
> .btn-group:not(:first-child) > .btn {
@include border-top-radius(0);
}
}
Expand Down