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

Flexbox button group #21394

Merged
merged 7 commits into from
Dec 28, 2016
Merged

Flexbox button group #21394

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
f718f67
revamp button group with flexbox
mdo Dec 22, 2016
0bf470a
linting
mdo Dec 27, 2016
3746116
Merge branch 'v4-dev' into flex-btn-group
mdo Dec 27, 2016
460ea94
remove commented out code
mdo Dec 27, 2016
2fd629b
auto size input groups, fixes #20506
mdo Dec 27, 2016
d0c6a62
inline-flex and width: 100% for stacked/vertical variation
mdo Dec 27, 2016
b1a2f36
follow up to the fix for #20506 with some docs examples of input grou…
mdo Dec 27, 2016
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
18 changes: 15 additions & 3 deletions docs/components/button-group.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,17 +26,17 @@ Wrap a series of buttons with `.btn` in `.btn-group`.

## Button toolbar

Combine sets of button groups into button toolbars for more complex components.
Combine sets of button groups into button toolbars for more complex components. Use utility classes as needed to space out groups, buttons, and more.

{% example html %}
<div class="btn-toolbar" role="toolbar" aria-label="Toolbar with button groups">
<div class="btn-group" role="group" aria-label="First group">
<div class="btn-group mr-2" role="group" aria-label="First group">
<button type="button" class="btn btn-secondary">1</button>
<button type="button" class="btn btn-secondary">2</button>
<button type="button" class="btn btn-secondary">3</button>
<button type="button" class="btn btn-secondary">4</button>
</div>
<div class="btn-group" role="group" aria-label="Second group">
<div class="btn-group mr-2" role="group" aria-label="Second group">
<button type="button" class="btn btn-secondary">5</button>
<button type="button" class="btn btn-secondary">6</button>
<button type="button" class="btn btn-secondary">7</button>
Expand Down Expand Up @@ -102,6 +102,18 @@ Place a `.btn-group` within another `.btn-group` when you want dropdown menus mi

Make a set of buttons appear vertically stacked rather than horizontally. **Split button dropdowns are not supported here.**

<div class="bd-example">
<div class="btn-group-vertical" role="group" aria-label="Vertical button group">
<button type="button" class="btn btn-secondary">Button</button>
<button type="button" class="btn btn-secondary">Button</button>
<button type="button" class="btn btn-secondary">Button</button>
<button type="button" class="btn btn-secondary">Button</button>
<button type="button" class="btn btn-secondary">Button</button>
<button type="button" class="btn btn-secondary">Button</button>
</div>
</div>


<div class="bd-example">
<div class="btn-group-vertical" role="group" aria-label="Vertical button group">
<button type="button" class="btn btn-secondary">Button</button>
Expand Down
58 changes: 19 additions & 39 deletions scss/_button-group.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,28 +4,27 @@
.btn-group,
.btn-group-vertical {
position: relative;
display: inline-block;
display: flex;
// display: inline-block;
vertical-align: middle; // match .btn alignment given font-size hack above

> .btn {
position: relative;
float: left;
margin-bottom: 0;
flex: 0 1 auto;

// Bring the "active" button to the front
// Bring the hover, focused, and "active" buttons to the fron to overlay
// the borders properly
@include hover {
z-index: 2;
}
&:focus,
&:active,
&.active {
z-index: 2;
}
@include hover {
z-index: 2;
}
}
}

// Prevent double borders when buttons are next to each other
.btn-group {
// Prevent double borders when buttons are next to each other
.btn + .btn,
.btn + .btn-group,
.btn-group + .btn,
Expand All @@ -36,19 +35,8 @@

// Optional: Group multiple button groups together for a toolbar
.btn-toolbar {
margin-left: -$btn-toolbar-margin; // Offset the first child's margin
@include clearfix();

.btn-group,
.input-group {
float: left;
}

> .btn,
> .btn-group,
> .input-group {
margin-left: $btn-toolbar-margin;
}
display: flex;
justify-content: flex-start;
}

.btn-group > .btn:not(:first-child):not(:last-child):not(.dropdown-toggle) {
Expand Down Expand Up @@ -158,22 +146,14 @@
//

.btn-group-vertical {
> .btn,
> .btn-group,
> .btn-group > .btn {
display: block;
float: none;
width: 100%;
max-width: 100%;
}

// Clear floats so dropdown menus can be properly placed
> .btn-group {
@include clearfix();

> .btn {
float: none;
}
display: flex;
flex-direction: column;
justify-content: center;
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Properties should be ordered display, flex-direction, align-items, justify-content

align-items: flex-start;

.btn,
.btn-group {
flex: 0 1 auto;
}

> .btn + .btn,
Expand Down