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

Button group refactoring and fixes #25395

Merged
merged 10 commits into from
Nov 4, 2018
Merged

Button group refactoring and fixes #25395

Changes from 3 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
79da414
Refactoring the button-group negative margin
ysds Jan 22, 2018
c40f3b4
Use :not() selector
ysds Jan 22, 2018
d0207e5
Add direct children selectors to avoid cascading styles into a menu f…
ysds Jan 22, 2018
ab18130
Merge branch 'v4-dev' into button-group-negative-margin
mdo Oct 21, 2018
72c1af7
Merge branch 'v4-dev' into button-group-negative-margin
XhmikosR Oct 30, 2018
b65d73d
Merge branch 'v4-dev' into button-group-negative-margin
XhmikosR Nov 1, 2018
88a1d90
Remove unnecessary comma
ysds Nov 2, 2018
d4eb145
Update _button-group.scss
XhmikosR Nov 2, 2018
9f9518c
Merge branch 'v4-dev' into button-group-negative-margin
XhmikosR Nov 2, 2018
59d18d7
Merge branch 'v4-dev' into button-group-negative-margin
XhmikosR Nov 4, 2018
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
25 changes: 8 additions & 17 deletions scss/_button-group.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,14 +22,6 @@
z-index: 1;
}
}

// Prevent double borders when buttons are next to each other
.btn + .btn,
.btn + .btn-group,
.btn-group + .btn,
.btn-group + .btn-group {
margin-left: -$btn-border-width;
}
}

// Optional: Group multiple button groups together for a toolbar
Expand All @@ -44,8 +36,10 @@
}

.btn-group {
> .btn:first-child {
margin-left: 0;
// Prevent double borders when buttons are next to each other
> .btn:not(:first-child),
> .btn-group:not(:first-child), {
margin-left: -$btn-border-width;
}

// Reset rounded corners
Expand Down Expand Up @@ -113,17 +107,14 @@
align-items: flex-start;
justify-content: center;

.btn,
.btn-group {
> .btn,
> .btn-group {
width: 100%;
}

> .btn + .btn,
> .btn + .btn-group,
> .btn-group + .btn,
> .btn-group + .btn-group {
> .btn:not(:first-child),
> .btn-group:not(:first-child), {
XhmikosR marked this conversation as resolved.
Show resolved Hide resolved
margin-top: -$btn-border-width;
margin-left: 0;
}

// Reset rounded corners
Expand Down