Skip to content

Commit 0c8ec3d

Browse files
committed
Merge branch 'master' into next
2 parents f7d74ef + bba7d3d commit 0c8ec3d

34 files changed

+9454
-4541
lines changed

CHANGELOG.md

Lines changed: 25 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,36 @@
1+
## 14.4.0
2+
3+
### :rocket: Enhancements
4+
- [#1089](https://github.com/primer/css/pull/1089) Accessible Progress
5+
6+
### :bug: Bug fixes
7+
- [#1060](https://github.com/primer/css/pull/1060) Add support for aria-current=false
8+
9+
### :memo: Documentation
10+
- [#1059](https://github.com/primer/css/pull/1059) Typo in scss.md
11+
- [#1065](https://github.com/primer/css/pull/1065) Convert markdown page to one big example
12+
- [#1075](https://github.com/primer/css/pull/1075) chore: add missing link to color utilities
13+
- [#1067](https://github.com/primer/css/pull/1067) Add .text-gray-light to docs
14+
15+
### Committers
16+
- [@daniseguraf](https://github.com/daniseguraf)
17+
- [@metonym](https://github.com/metonym)
18+
- [@simurai](https://github.com/simurai)
19+
120
## 14.3.0
221

322
### :rocket: Enhancements
423

5-
- [#1044](https://github.com/primer/css/1044) Accessible form validation
6-
- [#1028](https://github.com/primer/css/1028) Improve .form-group accessibility
24+
- [#1044](https://github.com/primer/css/pull/1044) Accessible form validation
25+
- [#1028](https://github.com/primer/css/pull/1028) Improve .form-group accessibility
726

827
### :bug: Bug fixes
9-
- [#670](https://github.com/primer/css/670) Fix Box row top border
10-
- [#1042](https://github.com/primer/css/1042) Fix UnderlineNav in Safari
11-
- [#1035](https://github.com/primer/css/1035) Update UnderlineNav-item to not wrap counter & icon
28+
- [#670](https://github.com/primer/css/pull/670) Fix Box row top border
29+
- [#1042](https://github.com/primer/css/pull/1042) Fix UnderlineNav in Safari
30+
- [#1035](https://github.com/primer/css/pull/1035) Update UnderlineNav-item to not wrap counter & icon
1231

1332
### :memo: Documentation
14-
- [#1018](https://github.com/primer/css/1018) Update MIGRATING.md
33+
- [#1018](https://github.com/primer/css/pull/1018) Update MIGRATING.md
1534

1635
### Committers
1736
- [@emplums](https://github.com/emplums)

deprecations.js

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,23 @@
44
* array and a "message" string.
55
*/
66
const versionDeprecations = {
7-
'14.2.0': [
7+
'14.4.0': [
88
{
99
selectors: [
10-
'.subnav-item.selected:hover',
11-
'.subnav-item.selected:focus',
12-
'.autocomplete-item[aria-selected="true"]',
13-
'.autocomplete-item[aria-selected="true"] *'
10+
'.breadcrumb-item[aria-current]',
11+
'.breadcrumb-item[aria-current]::after',
12+
'.menu-item[aria-current]',
13+
'.menu-item[aria-current]::before',
14+
'.tabnav-tab[aria-current]',
15+
'.filter-item[aria-current]',
16+
'.SideNav-item[aria-current="page"]',
17+
'.SideNav-item[aria-current="page"]::before',
18+
'.SideNav-subItem[aria-current="page"]',
19+
'.subnav-item[aria-current]',
20+
'.UnderlineNav-item[aria-current]',
21+
'.UnderlineNav-item[aria-current] .UnderlineNav-octicon',
22+
'.pagination [aria-current]',
23+
'.pagination [aria-current]:hover'
1424
],
1525
message: `These selectors are not needed anymore.`
1626
}

docs/content/components/avatars.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,7 @@ Use `AvatarStack--right` to right-align the avatar stack. Remember to switch the
198198
</div>
199199
```
200200

201-
## Circle Badge
201+
## Circle badge
202202

203203
`.CircleBadge` allows for the display of badge-like icons or logos. They are used mostly with Octicons or partner integration icons.
204204

docs/content/components/boxed-groups.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
title: Boxed groups
2+
title: Boxed groups (deprecated)
33
path: components/boxed-group
44
status: Deprecated
55
source: 'https://github.com/github/github/blob/master/app/assets/stylesheets/components/boxed-groups.scss'

docs/content/components/buttons.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ Outline buttons downplay an action as they appear like boxy links. Just add `.bt
5757

5858
Use `.btn-large` to increase the padding and border radius of a button. This is useful for prominent calls to action in hero sections.
5959

60-
[Type scale utilities](https://styleguide.github.com/primer/utilities/typography/#type-scale-utilities) can be used to alter the font-size if needed. Padding is applied in em's so that it scales proportionally with the font-size.
60+
[Type scale utilities](/support/typography#type-scale) can be used to alter the font-size if needed. Padding is applied in em's so that it scales proportionally with the font-size.
6161

6262
```html live
6363
<button class="btn btn-large mr-2" type="button">Large button</button>

docs/content/components/loaders.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ bundle: loaders
88

99
Loaders inform users that an action is still in progress and might take a while to complete.
1010

11-
## Animated Ellipsis
11+
## Animated ellipsis
1212

1313
Add an animated ellipsis at the end of text with `<span class="AnimatedEllipsis"></span>`.
1414

docs/content/components/markdown.md

Lines changed: 280 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,284 @@ bundle: markdown
77
---
88

99

10+
```html live
11+
<div class="markdown-body">
12+
<p>Text can be <b>bold</b>, <i>italic</i>, or <s>strikethrough</s>. <a href="https://github.com">Links </a> should be blue with no underlines (unless hovered over).</p>
13+
14+
<p>There should be whitespace between paragraphs. There should be whitespace between paragraphs. There should be whitespace between paragraphs. There should be whitespace between paragraphs.</p>
15+
16+
<p>There should be whitespace between paragraphs. There should be whitespace between paragraphs. There should be whitespace between paragraphs. There should be whitespace between paragraphs.</p>
17+
18+
<blockquote>
19+
<p>There should be no margin above this first sentence.</p>
20+
<p>Blockquotes should be a lighter gray with a gray border along the left side.</p>
21+
<p>There should be no margin below this final sentence.</p>
22+
</blockquote>
23+
24+
<h1>Header 1</h1>
25+
26+
<p>This is a normal paragraph following a header. Bacon ipsum dolor sit amet t-bone doner shank drumstick, pork belly porchetta chuck sausage brisket ham hock rump pig. Chuck kielbasa leberkas, pork bresaola ham hock filet mignon cow shoulder short ribs biltong.</p>
27+
28+
<h2>Header 2</h2>
29+
30+
<blockquote>This is a blockquote following a header. Bacon ipsum dolor sit amet t-bone doner shank drumstick, pork belly porchetta chuck sausage brisket ham hock rump pig. Chuck kielbasa leberkas, pork bresaola ham hock filet mignon cow shoulder short ribs biltong.</blockquote>
31+
32+
<h3>Header 3</h3>
33+
34+
<pre><code>This is a code block following a header.</code></pre>
35+
36+
<h4>Header 4</h4>
37+
38+
<ul>
39+
<li>This is an unordered list following a header.</li>
40+
<li>This is an unordered list following a header.</li>
41+
<li>This is an unordered list following a header.</li>
42+
</ul>
43+
44+
<h5>Header 5</h5>
45+
46+
<ol>
47+
<li>This is an ordered list following a header.</li>
48+
<li>This is an ordered list following a header.</li>
49+
<li>This is an ordered list following a header.</li>
50+
</ol>
51+
52+
<h6>Header 6</h6>
53+
54+
<table>
55+
<thead>
56+
<tr>
57+
<th>What</th>
58+
<th>Follows</th>
59+
</tr>
60+
</thead>
61+
<tbody>
62+
<tr>
63+
<td>A table</td>
64+
<td>A header</td>
65+
</tr>
66+
<tr>
67+
<td>A table</td>
68+
<td>A header</td>
69+
</tr>
70+
<tr>
71+
<td>A table</td>
72+
<td>A header</td>
73+
</tr>
74+
</tbody>
75+
</table>
76+
77+
<hr />
78+
79+
<p>There's a horizontal rule above and below this.</p>
80+
81+
<hr />
82+
83+
<p>Here is an unordered list:</p>
84+
85+
<ul>
86+
<li>Salt-n-Pepa</li>
87+
<li>Bel Biv DeVoe</li>
88+
<li>Kid 'N Play</li>
89+
</ul>
90+
91+
<p>And an ordered list:</p>
92+
93+
<ol>
94+
<li>Michael Jackson</li>
95+
<li>Michael Bolton</li>
96+
<li>Michael Bublé</li>
97+
</ol>
98+
99+
<p>And an unordered task list:</p>
100+
101+
<ul>
102+
<li><input type="checkbox" checked> Create a sample markdown document</li>
103+
<li><input type="checkbox"> Add task lists to it</li>
104+
<li><input type="checkbox"> Take a vacation</li>
105+
</ul>
106+
107+
<p>And a "mixed" task list:</p>
108+
109+
<ul>
110+
<li><input type="checkbox"> Steal underpants</li>
111+
<li>?</li>
112+
<li><input type="checkbox"> Profit!</li>
113+
</ul>
114+
115+
And a nested list:
116+
117+
<ul>
118+
<li>Jackson 5
119+
<ul>
120+
<li>Michael</li>
121+
<li>Tito</li>
122+
<li>Jackie</li>
123+
<li>Marlon</li>
124+
<li>Jermaine</li>
125+
</ul>
126+
</li>
127+
<li>TMNT
128+
<ul>
129+
<li>Leonardo</li>
130+
<li>Michelangelo</li>
131+
<li>Donatello</li>
132+
<li>Raphael</li>
133+
</ul>
134+
</li>
135+
</ul>
136+
137+
<p>Definition lists can be used with HTML syntax. Definition terms are bold and italic.</p>
138+
139+
<dl>
140+
<dt>Name</dt>
141+
<dd>Godzilla</dd>
142+
<dt>Born</dt>
143+
<dd>1952</dd>
144+
<dt>Birthplace</dt>
145+
<dd>Japan</dd>
146+
<dt>Color</dt>
147+
<dd>Green</dd>
148+
</dl>
149+
150+
<hr />
151+
152+
<p>Tables should have bold headings and alternating shaded rows.</p>
153+
154+
<table>
155+
<thead>
156+
<tr>
157+
<th>Artist</th>
158+
<th>Album</th>
159+
<th>Year</th>
160+
</tr>
161+
</thead>
162+
<tbody>
163+
<tr>
164+
<td>David Bowie</td>
165+
<td>Scary Monsters</td>
166+
<td>1980</td>
167+
</tr>
168+
<tr>
169+
<td>Prince</td>
170+
<td>Purple Rain</td>
171+
<td>1982</td>
172+
</tr>
173+
<tr>
174+
<td>Beastie Boys</td>
175+
<td>License to Ill</td>
176+
<td>1986</td>
177+
</tr>
178+
<tr>
179+
<td>Janet Jackson</td>
180+
<td>Rhythm Nation 1814</td>
181+
<td>1989</td>
182+
</tr>
183+
</tbody>
184+
</table>
185+
186+
<p>If a table is too wide, it should condense down and/or scroll horizontally.</p>
187+
188+
<table>
189+
<thead>
190+
<tr>
191+
<th>Artist</th>
192+
<th>Album</th>
193+
<th>Year</th>
194+
<th>Label</th>
195+
<th>Songs</th>
196+
</tr>
197+
</thead>
198+
<tbody>
199+
<tr>
200+
<td>David Bowie</td>
201+
<td>Scary Monsters</td>
202+
<td>1980</td>
203+
<td>RCA Records</td>
204+
<td>It's No Game (No. 1), Up the Hill Backwards, Scary Monsters (And Super Creeps), Ashes to Ashes, Fashion, Teenage Wildlife, Scream Like a Baby, Kingdom Come, Because You're Young, It's No Game (No. 2)</td>
205+
</tr>
206+
<tr>
207+
<td>Prince</td>
208+
<td>Purple Rain</td>
209+
<td>1982</td>
210+
<td>Warner Brothers Records</td>
211+
<td>Let's Go Crazy, Take Me With U, The Beautiful Ones, Computer Blue, Darling Nikki, When Doves Cry, I Would Die 4 U, Baby I'm a Star, Purple Rain</td>
212+
</tr>
213+
<tr>
214+
<td>Beastie Boys</td>
215+
<td>License to Ill</td>
216+
<td>1986</td>
217+
<td>Def Jam</td>
218+
<td>Rhymin &amp; Stealin, The New Style, She's Crafty, Posse in Effect, Slow Ride, Girls, Fight for Your Right, No Sleep till Brooklyn, Paul Revere, "Hold It Now, Hit It", Brass Monkey, Slow and Low, Time to Get Ill</td>
219+
</tr>
220+
<tr>
221+
<td>Janet Jackson</td>
222+
<td>Rhythm Nation 1814</td>
223+
<td>1989</td>
224+
<td>A&amp;M</td>
225+
<td>Interlude: Pledge, Rhythm Nation, Interlude: T.V., State of the World, Interlude: Race, The Knowledge, Interlude: Let's Dance, Miss You Much, Interlude: Come Back, Love Will Never Do (Without You), Livin' in a World (They Didn't Make), Alright, Interlude: Hey Baby, Escapade, Interlude: No Acid, Black Cat, Lonely, Come Back to Me, Someday Is Tonight, Interlude: Livin'...In Complete Darkness</td>
226+
</tr>
227+
</tbody>
228+
</table>
229+
230+
<hr />
231+
232+
<p>Code snippets like <code>var foo = "bar";</code> can be shown inline.</p>
233+
234+
<p>Also, <code>this should vertically align</code> <s><code>with this</code></s> <s>and this</s>.</p>
235+
236+
<p>Code can also be shown in a block element.</p>
237+
238+
<pre><code>var foo = "bar";</code></pre>
239+
240+
<p>Code can also use syntax highlighting.</p>
241+
242+
<pre><code class="prism-code language-javascript">var foo = "bar";</code></pre>
243+
244+
<pre><code>Long, single-line code blocks should not wrap. They should horizontally scroll if they are too long. This line should be long enough to demonstrate this.</code></pre>
245+
246+
<pre><code class="prism-code language-javascript">var foo = "The same thing is true for code with syntax highlighting. A single line of code should horizontally scroll if it is really long.";</code></pre>
247+
248+
<p>Inline code inside table cells should still be distinguishable.</p>
249+
250+
<table>
251+
<thead>
252+
<tr>
253+
<th>Language</th>
254+
<th>Code</th>
255+
</tr>
256+
</thead>
257+
<tbody>
258+
<tr>
259+
<td>JavasScript</td>
260+
<td><code>var foo = "bar";</code></td>
261+
</tr>
262+
<tr>
263+
<td>Ruby</td>
264+
<td><code>foo = "bar"</code></td>
265+
</tr>
266+
</tbody>
267+
</table>
268+
269+
<hr />
270+
271+
<p>Small images should be shown at their actual size.</p>
272+
273+
<p><img src="http://placekitten.com/g/300/200/"></p>
274+
275+
<p>Large images should always scale down and fit in the content container.</p>
276+
277+
<p><img src="http://placekitten.com/g/1200/800/"></p>
278+
279+
<pre><code>This is the final element on the page and there should be no margin below this.</code></pre>
280+
</div>
281+
```
282+
283+
284+
<!-- Source MD (update when making changes to the HTML) -->
285+
286+
<!--
287+
10288
Text can be **bold**, _italic_, or ~~strikethrough~~. [Links](https://github.com) should be blue with no underlines (unless hovered over).
11289
12290
There should be whitespace between paragraphs. There should be whitespace between paragraphs. There should be whitespace between paragraphs. There should be whitespace between paragraphs.
@@ -172,3 +450,5 @@ Large images should always scale down and fit in the content container.
172450
```
173451
This is the final element on the page and there should be no margin below this.
174452
```
453+
454+
-->

0 commit comments

Comments
 (0)