Skip to content

Commit a2a1486

Browse files
committed
Merge branch 'next_major' into remove_break_word
2 parents 89deec5 + c3a938f commit a2a1486

File tree

3 files changed

+7
-7
lines changed

3 files changed

+7
-7
lines changed

.github/workflows/welcome.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ on:
44

55
jobs:
66
release-template:
7-
if: ${{ github.head_ref == 'changeset-release/main' }}
7+
if: ${{ github.head_ref == 'changeset-release/main' || github.head_ref == 'changeset-release/next_major' }}
88
runs-on: ubuntu-latest
99
steps:
1010
- name: Checkout repository

docs/content/utilities/typography.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -110,12 +110,12 @@ Change the font weight, styles, and alignment with these utilities.
110110
## Word-break
111111
There are two utilities for adjusting how lines and words of text break when they exceed the width of their containing element:
112112

113-
1. `break-word` sets `word-break: break-word` and `overflow-wrap: break-word`, which will only break words if they would exceed the line length _after wrapping_.
113+
1. `wb-break-word` sets `word-break: break-word` and `overflow-wrap: break-word`, which will only break words if they would exceed the line length _after wrapping_.
114114

115115
2. `wb-break-all` sets `word-break: break-all`, which will force a word to break regardless of whether it's shorter than the line length. See [MDN's `word-break` docs](https://developer.mozilla.org/en-US/docs/Web/CSS/word-break#Values) for more info.
116116

117117
```html live
118-
<p class="break-word p-2 color-bg-secondary col-3 border-right">.break-word will only break long words that exceed the line length, such as supercalifragilisticexpialidocious. Long words like "exceedingly" will simply break to the next line.</p>
118+
<p class="wb-break-word p-2 color-bg-secondary col-3 border-right">.wb-break-word will only break long words that exceed the line length, such as supercalifragilisticexpialidocious. Long words like "exceedingly" will simply break to the next line.</p>
119119
<p class="wb-break-all p-2 color-bg-secondary col-3 border-right">.wb-break-all will break any word that meets the end its line, and should be used sparingly. As you can see here, it's not particularly nice to read text that breaks in weird places.</p>
120120
```
121121

src/marketing/buttons/button.scss

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
display: inline-block;
55
appearance: none !important;
66
// stylelint-disable-next-line primer/spacing
7-
padding: .9rem 1.5rem 1.1rem;
7+
padding: 0.9rem 1.5rem 1.1rem;
88
// stylelint-disable-next-line primer/typography
99
font-size: 1rem;
1010
font-weight: $font-weight-bold;
@@ -14,7 +14,7 @@
1414
user-select: none;
1515
border: 0;
1616
// stylelint-disable-next-line primer/borders
17-
border-radius: .375rem;
17+
border-radius: 0.375rem;
1818

1919
@include btn-solid-mktg(
2020
var(--color-mktg-btn-text),
@@ -34,7 +34,7 @@
3434
z-index: -1;
3535
content: "";
3636
// stylelint-disable-next-line primer/borders
37-
border-radius: .375rem;
37+
border-radius: 0.375rem;
3838
opacity: 0;
3939
transition: opacity 0.4s;
4040
}
@@ -97,7 +97,7 @@
9797

9898
.btn-small-mktg {
9999
// stylelint-disable-next-line primer/spacing
100-
padding: .625rem 1rem .8125rem;
100+
padding: 0.625rem 1rem 0.8125rem;
101101
}
102102

103103
.btn-large-mktg {

0 commit comments

Comments
 (0)