Skip to content

Commit d96ba5f

Browse files
author
Emily
committed
Merge branch 'release-10.8.0' of github.com:primer/primer into release-10.8.0
2 parents 62a7578 + 30c31f9 commit d96ba5f

File tree

2 files changed

+7
-2
lines changed

2 files changed

+7
-2
lines changed

modules/primer-buttons/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -223,12 +223,12 @@ Have a hankering for a series of buttons that are attached to one another? Wrap
223223
</div>
224224
```
225225

226-
Add `.BtnGroup-form` to `<form>`s within `.BtnGroup`s for proper spacing and rounded corners.
226+
Add `.BtnGroup-parent` to parent elements, like `<form>`s or `<details>`s, within `.BtnGroup`s for proper spacing and rounded corners.
227227

228228
```html
229229
<div class="BtnGroup">
230230
<button class="btn BtnGroup-item" type="button">Button</button>
231-
<form class="BtnGroup-form">
231+
<form class="BtnGroup-parent">
232232
<button class="btn BtnGroup-item" type="button">Button in a form</button>
233233
</form>
234234
<button class="btn BtnGroup-item" type="button">Button</button>

modules/primer-buttons/lib/button-group.scss

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22
//
33
// A button group is a series of buttons laid out next to each other, all part
44
// of one visual button, but separated by rules to be separate.
5+
@warn ".BtnGroup-form will be deprecated in version 11. Use .BtnGroup-parent instead.";
6+
57
.BtnGroup {
68
display: inline-block;
79
vertical-align: middle;
@@ -38,12 +40,14 @@
3840
border-right-width: 1px;
3941

4042
+ .BtnGroup-item,
43+
+ .BtnGroup-parent .BtnGroup-item,
4144
+ .BtnGroup-form .BtnGroup-item {
4245
border-left-width: 0;
4346
}
4447
}
4548
}
4649

50+
.BtnGroup-parent,
4751
.BtnGroup-form {
4852
float: left;
4953

@@ -72,6 +76,7 @@
7276
}
7377

7478
+ .BtnGroup-item,
79+
+ .BtnGroup-parent .BtnGroup-item,
7580
+ .BtnGroup-form .BtnGroup-item {
7681
border-left-width: 0;
7782
}

0 commit comments

Comments
 (0)