Skip to content

Commit e860b64

Browse files
authored
Merge branch 'main' into patch-1
2 parents b29ddc5 + 1048c65 commit e860b64

File tree

7 files changed

+51
-37
lines changed

7 files changed

+51
-37
lines changed

.changeset/nine-rivers-smoke.md

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

CHANGELOG.md

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

3+
## 22.0.2
4+
5+
### Patch Changes
6+
7+
- [#2866](https://github.com/primer/css/pull/2866) [`d43c856`](https://github.com/primer/css/commit/d43c85624326770d91e8239c0c5e6693700e4481) Thanks [@lukasoppermann](https://github.com/lukasoppermann)! - Update @primer/primitives peerDependencies to 10.x || 11.x
8+
9+
- [#2871](https://github.com/primer/css/pull/2871) [`0d2eb58`](https://github.com/primer/css/commit/0d2eb58fbf18092c2ef4ba252522fea98a6aaa1f) Thanks [@lukasoppermann](https://github.com/lukasoppermann)! - Add default font weight (--base-text-weight-normal, 400) to body
10+
11+
## 22.0.1
12+
13+
### Patch Changes
14+
15+
- [#2864](https://github.com/primer/css/pull/2864) [`0311c08`](https://github.com/primer/css/commit/0311c0849cdfc0fcb18ee0ed96ce2a3ba5c136d6) Thanks [@lukasoppermann](https://github.com/lukasoppermann)! - Add --fontStack-sansSerif to $body-font variable
16+
17+
## 22.0.0
18+
19+
### Major Changes
20+
21+
- [#2789](https://github.com/primer/css/pull/2789) [`4113637`](https://github.com/primer/css/commit/4113637b3bb60cad1e2dca82e70d92ad05694399) Thanks [@jonrohan](https://github.com/jonrohan)! - Remove @primer/view-components imports for styles moved to primer/view_components
22+
323
## 21.5.1
424

525
### Patch Changes

docs/package-lock.json

Lines changed: 24 additions & 26 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package-lock.json

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@primer/css",
3-
"version": "21.5.1",
3+
"version": "22.0.2",
44
"description": "The CSS implementation of GitHub's Primer Design System",
55
"homepage": "https://primer.style/css",
66
"author": "GitHub, Inc.",
@@ -72,7 +72,7 @@
7272
"table": "^6.8.1"
7373
},
7474
"peerDependencies": {
75-
"@primer/primitives": "9.x || 10.x"
75+
"@primer/primitives": "10.x || 11.x"
7676
},
7777
"jest": {
7878
"testEnvironment": "node",

src/base/base.scss

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ button {
1515
body {
1616
font-family: $body-font;
1717
font-size: var(--body-font-size, $body-font-size);
18+
font-weight: var(--base-text-weight-normal, 400);
1819
line-height: $body-line-height;
1920
color: var(--fgColor-default, var(--color-fg-default));
2021
background-color: var(--bgColor-default, var(--color-canvas-default));

src/support/variables/typography.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ $lh-condensed: 1.25 !default;
3232
$lh-default: 1.5 !default;
3333

3434
// Font stacks
35-
$body-font: -apple-system, BlinkMacSystemFont, 'Segoe UI', 'Noto Sans', Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji' !default;
35+
$body-font: var(--fontStack-sansSerif, -apple-system, BlinkMacSystemFont, 'Segoe UI', 'Noto Sans', Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji') !default;
3636

3737
// Monospace font stack
3838
// Note: SFMono-Regular needs to come before SF Mono to fix an older version of the font in Chrome

0 commit comments

Comments
 (0)