Skip to content

Commit 3ffcfe0

Browse files
authored
Merge branch 'main' into fix-avatar-stack
2 parents 04bfbe3 + 6569fb3 commit 3ffcfe0

File tree

11 files changed

+618
-455
lines changed

11 files changed

+618
-455
lines changed

.changeset/brown-grapes-swim.md

Lines changed: 0 additions & 6 deletions
This file was deleted.

.changeset/clean-wombats-run.md

Lines changed: 0 additions & 5 deletions
This file was deleted.

.changeset/fresh-llamas-stare.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"@primer/css": patch
3+
---
4+
5+
Fix nested `<ul>` in footnotes

CHANGELOG.md

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,40 @@
11
# @primer/css
22

3+
## 20.4.6
4+
5+
### Patch Changes
6+
7+
- [#2266](https://github.com/primer/css/pull/2266) [`c28cdf7e`](https://github.com/primer/css/commit/c28cdf7effbd3bd750585543ff774e1e7c84873a) Thanks [@langermank](https://github.com/langermank)! - Remove scrollbar CSS property from Overlay
8+
9+
* [#2255](https://github.com/primer/css/pull/2255) [`1a9a6689`](https://github.com/primer/css/commit/1a9a668931c51cb4ca0867173af78f1e18d2662d) Thanks [@jdrush89](https://github.com/jdrush89)! - Fixing ActionList Item hover focus style
10+
11+
- [#2249](https://github.com/primer/css/pull/2249) [`81083778`](https://github.com/primer/css/commit/81083778a73c1d1f0f37b4efefe5359926ce4269) Thanks [@koddsson](https://github.com/koddsson)! - Increase specificy for Overlay styles as they relate to the backdrop and positioning options
12+
- If a Dialog opens a second Dialog, each Dialog properties should be contained to its own scope
13+
14+
## 20.4.5
15+
16+
### Patch Changes
17+
18+
- [#2242](https://github.com/primer/css/pull/2242) [`ef31fd98`](https://github.com/primer/css/commit/ef31fd988d52391317cc8982caf06ef45732ca70) Thanks [@JoshBowdenConcepts](https://github.com/JoshBowdenConcepts)! - This border change was made to ensure that assignee avatars would stack next to one another correctly.
19+
20+
## 20.4.4
21+
22+
### Patch Changes
23+
24+
- [#2218](https://github.com/primer/css/pull/2218) [`6205337b`](https://github.com/primer/css/commit/6205337b4c871b6ce431c8b211ddb0bbd176946f) Thanks [@langermank](https://github.com/langermank)! - - Adding readonly styles
25+
- Fixing focus background color for inset field
26+
27+
* [#2211](https://github.com/primer/css/pull/2211) [`8e5f6224`](https://github.com/primer/css/commit/8e5f62244192a8e2a191be7e7ad20d00f4b4bedb) Thanks [@imjohnbo](https://github.com/imjohnbo)! - Remove outline reset of `.SelectMenu-closeButton`
28+
29+
- [#2220](https://github.com/primer/css/pull/2220) [`1a8e7db5`](https://github.com/primer/css/commit/1a8e7db5f6c7b369fcfb6598df2edc42d0511da7) Thanks [@reeceatkinson](https://github.com/reeceatkinson)! - Update Marketing Typography (marketing-type.md)
30+
31+
* [#2229](https://github.com/primer/css/pull/2229) [`8a4c0878`](https://github.com/primer/css/commit/8a4c0878857ff65447906bf7d969211f96715197) Thanks [@jonrohan](https://github.com/jonrohan)! - ActionList hide the first divider if there's hidden items in front of it.
32+
33+
- [#2225](https://github.com/primer/css/pull/2225) [`56ea4ab1`](https://github.com/primer/css/commit/56ea4ab17644ad0d521373f700d551d66217268a) Thanks [@langermank](https://github.com/langermank)! - Overlay updates for Alpha::Dialog
34+
- Size improvements
35+
- Support buttom and side sheets
36+
- Preliminary animations for sheets
37+
338
## 20.4.3
439

540
### Patch Changes

docs/content/utilities/marketing-type.md

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,20 +6,20 @@ source: 'https://github.com/primer/css/tree/main/src/marketing/type'
66
bundle: marketing-type
77
---
88

9-
The typography for our marketing pages differs from Primer CSS's core—it is responsive, on a slightly different scale, and headlines are set in the [defined marketing font](https://github.com/primer/css/blob/main/src/marketing/support/variables.scss).
9+
The typography for our marketing pages differs from Primer CSS's core. It is responsive, on a slightly different scale, and headlines are set in the [defined marketing font](https://github.com/primer/css/blob/main/src/marketing/support/variables.scss).
1010

1111
## Heading utilities
1212

1313
Use `.h0-mktg``.h6-mktg` to change an element's font, size, and weight on marketing pages.
1414

1515
```html live title="Heading Utilities"
16-
<p class="h0-mktg">This is a heading 0</p>
17-
<p class="h1-mktg">This is a heading 1</p>
18-
<p class="h2-mktg">This is a heading 2</p>
19-
<p class="h3-mktg">This is a heading 3</p>
20-
<p class="h4-mktg">This is a heading 4</p>
21-
<p class="h5-mktg">This is a heading 5</p>
22-
<p class="h6-mktg">This is a heading 6</p>
16+
<p class="h0-mktg">This is heading 0</p>
17+
<p class="h1-mktg">This is heading 1</p>
18+
<p class="h2-mktg">This is heading 2</p>
19+
<p class="h3-mktg">This is heading 3</p>
20+
<p class="h4-mktg">This is heading 4</p>
21+
<p class="h5-mktg">This is heading 5</p>
22+
<p class="h6-mktg">This is heading 6</p>
2323
```
2424

2525
## Body content utilities

package.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@primer/css",
3-
"version": "20.4.3",
3+
"version": "20.4.6",
44
"description": "The CSS implementation of GitHub's Primer Design System",
55
"homepage": "https://primer.style/css",
66
"author": "GitHub, Inc.",
@@ -50,28 +50,28 @@
5050
"@github/prettier-config": "0.0.4",
5151
"@koddsson/postcss-sass": "5.0.1",
5252
"@primer/stylelint-config": "^12.4.0",
53-
"autoprefixer": "10.4.8",
53+
"autoprefixer": "10.4.12",
5454
"chokidar-cli": "3.0.0",
5555
"cssstats": "4.0.5",
56-
"eslint": "8.21.0",
56+
"eslint": "8.23.1",
5757
"eslint-plugin-github": "4.3.7",
5858
"eslint-plugin-jest": "26.8.2",
5959
"eslint-plugin-prettier": "4.2.1",
6060
"filesize": "9.0.11",
6161
"front-matter": "4.0.2",
6262
"fs-extra": "10.1.0",
6363
"globby": "13.1.2",
64-
"jest": "28.1.3",
64+
"jest": "29.0.3",
6565
"js-yaml": "4.1.0",
6666
"postcss": "8.4.16",
6767
"postcss-calc": "8.2.4",
68-
"postcss-import": "14.1.0",
68+
"postcss-import": "15.0.0",
6969
"postcss-load-config": "4.0.1",
7070
"postcss-scss": "4.0.4",
7171
"postcss-simple-vars": "6.0.3",
7272
"prettier": "2.7.1",
7373
"semver": "7.3.7",
74-
"stylelint": "14.10.0",
74+
"stylelint": "14.11.0",
7575
"table": "6.8.0"
7676
},
7777
"jest": {

src/actionlist/action-list-item.scss

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
cursor: pointer;
3333
background-color: var(--color-action-list-item-default-hover-bg);
3434

35-
&:not(.ActionList-item--navActive) {
35+
&:not(.ActionList-item--navActive):not(:focus-visible) {
3636
// Support for "Windows high contrast mode"
3737
outline: $border-style $border-width transparent;
3838
outline-offset: -$border-width;
@@ -113,6 +113,11 @@
113113
}
114114
}
115115

116+
// Make sure that the first visible item isn't a divider
117+
&[hidden] + .ActionList-sectionDivider {
118+
display: none;
119+
}
120+
116121
// Autocomplete [aria-selected] items
117122

118123
&[aria-selected='true'] {

src/avatars/avatar-stack.scss

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@
5858
// stylelint-enable selector-max-type
5959

6060
// Account for 4+ avatars
61-
&:nth-child(n+4) {
61+
&:nth-child(n + 4) {
6262
display: none;
6363
opacity: 0;
6464
}
@@ -70,7 +70,7 @@
7070
margin-right: 3px;
7171
}
7272

73-
.avatar:nth-child(n+4) {
73+
.avatar:nth-child(n + 4) {
7474
display: flex;
7575
opacity: 1;
7676
}
@@ -120,6 +120,10 @@
120120
// stylelint-disable-next-line primer/spacing
121121
margin-left: 3px;
122122
}
123+
124+
.avatar:not(:last-child) {
125+
border-left: 0;
126+
}
123127
}
124128

125129
.avatar.avatar-more {

src/markdown/footnotes.scss

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,12 @@
1919

2020
ol {
2121
padding-left: $spacer-3;
22+
23+
ul {
24+
display: inline-block;
25+
padding-left: $spacer-3;
26+
margin-top: $spacer-3;
27+
}
2228
}
2329

2430
li {

src/overlay/overlay.scss

Lines changed: 94 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,17 +15,67 @@ $primer-borderRadius-large: 0.75rem;
1515

1616
.Overlay {
1717
display: flex;
18+
width: min(var(--overlay-width), 100vw - 2rem);
1819
min-width: 192px;
20+
max-height: min(calc(100vh - 2rem), var(--overlay-height));
1921
flex-direction: column;
2022
background-color: var(--color-canvas-overlay);
2123
border-radius: $primer-borderRadius-large;
2224
box-shadow: var(--color-overlay-shadow);
2325
opacity: 1;
2426

27+
&.Overlay--size-auto {
28+
min-width: 192px;
29+
max-width: calc(100vw - 2rem);
30+
max-height: calc(100vh - 2rem);
31+
}
32+
33+
&.Overlay--size-full {
34+
width: 100vw;
35+
height: 100vh;
36+
}
37+
38+
&.Overlay--size-xsmall {
39+
--overlay-width: 192px;
40+
41+
max-height: calc(100vh - 2rem);
42+
}
43+
44+
&.Overlay--size-small {
45+
--overlay-height: 256px;
46+
--overlay-width: 320px;
47+
}
48+
49+
&.Overlay--size-small-portrait {
50+
--overlay-height: 432px;
51+
--overlay-width: 320px;
52+
}
53+
54+
&.Overlay--size-medium {
55+
--overlay-height: 320px;
56+
--overlay-width: 480px;
57+
}
58+
59+
&.Overlay--size-medium-portrait {
60+
--overlay-height: 600px;
61+
--overlay-width: 480px;
62+
}
63+
64+
&.Overlay--size-large {
65+
--overlay-height: 432px;
66+
--overlay-width: 640px;
67+
}
68+
69+
&.Overlay--size-xlarge {
70+
--overlay-height: 600px;
71+
--overlay-width: 960px;
72+
}
73+
2574
&.Overlay--height-auto {
2675
height: auto;
2776
}
2877

78+
// start deprecate in favor of Alpha::Dialog
2979
&.Overlay--height-xsmall {
3080
height: min(192px, 100vh - 2rem);
3181
}
@@ -73,6 +123,8 @@ $primer-borderRadius-large: 0.75rem;
73123
width: min(960px, 100vw - 2rem);
74124
}
75125

126+
// end deprecate
127+
76128
&.Overlay--motion-scaleFade {
77129
@media screen and (prefers-reduced-motion: no-preference) {
78130
animation: 200ms cubic-bezier(0.33, 1, 0.68, 1) 0s 1 normal none running Overlay--motion-scaleFade;
@@ -292,40 +344,59 @@ $primer-borderRadius-large: 0.75rem;
292344
align-items: center;
293345
justify-content: left;
294346

295-
.Overlay#{$responsiveVariant} {
347+
> .Overlay#{$responsiveVariant} {
348+
height: 100vh;
349+
max-height: unset;
296350
border-radius: $primer-borderRadius-large;
297351
border-top-left-radius: 0;
298352
border-bottom-left-radius: 0;
353+
354+
@media screen and (prefers-reduced-motion: no-preference) {
355+
animation: 160ms cubic-bezier(0.32, 0, 0.67, 0) 0s 1 normal none running Overlay--motion-slideInRight;
356+
}
299357
}
300358
}
301359

302360
&.Overlay-backdrop--placement-right#{$responsiveVariant} {
303361
align-items: center;
304362
justify-content: right;
305363

306-
.Overlay#{$responsiveVariant} {
364+
> .Overlay#{$responsiveVariant} {
365+
height: 100vh;
366+
max-height: unset;
307367
border-radius: $primer-borderRadius-large;
308368
border-top-right-radius: 0;
309369
border-bottom-right-radius: 0;
370+
371+
@media screen and (prefers-reduced-motion: no-preference) {
372+
animation: 160ms cubic-bezier(0.32, 0, 0.67, 0) 0s 1 normal none running Overlay--motion-slideInLeft;
373+
}
310374
}
311375
}
312376

313377
&.Overlay-backdrop--placement-bottom#{$responsiveVariant} {
314378
align-items: end;
315379
justify-content: center;
316380

317-
.Overlay#{$responsiveVariant} {
381+
> .Overlay#{$responsiveVariant} {
382+
width: 100vw;
383+
height: auto;
384+
max-height: calc(100vh - 2rem);
318385
border-radius: $primer-borderRadius-large;
319386
border-bottom-right-radius: 0;
320387
border-bottom-left-radius: 0;
388+
389+
@media screen and (prefers-reduced-motion: no-preference) {
390+
animation: 160ms cubic-bezier(0.32, 0, 0.67, 0) 0s 1 normal none running Overlay--motion-slideUp;
391+
}
321392
}
322393
}
323394

324395
&.Overlay-backdrop--placement-top#{$responsiveVariant} {
325396
align-items: start;
326397
justify-content: center;
327398

328-
.Overlay#{$responsiveVariant} {
399+
> .Overlay#{$responsiveVariant} {
329400
border-radius: $primer-borderRadius-large;
330401
border-top-left-radius: 0;
331402
border-top-right-radius: 0;
@@ -342,7 +413,7 @@ $primer-borderRadius-large: 0.75rem;
342413
max-width: 100vw;
343414
height: 100%;
344415
max-height: 100vh;
345-
border-radius: unset;
416+
border-radius: unset !important;
346417
flex-grow: 1;
347418
}
348419
}
@@ -383,3 +454,21 @@ $primer-borderRadius-large: 0.75rem;
383454
@include Overlay-backdrop--full;
384455
}
385456
}
457+
458+
@keyframes Overlay--motion-slideUp {
459+
from {
460+
transform: translateY(100%);
461+
}
462+
}
463+
464+
@keyframes Overlay--motion-slideInRight {
465+
from {
466+
transform: translateX(-100%);
467+
}
468+
}
469+
470+
@keyframes Overlay--motion-slideInLeft {
471+
from {
472+
transform: translateX(100%);
473+
}
474+
}

0 commit comments

Comments
 (0)