Skip to content

Commit d537c3d

Browse files
mperrottimperrotti
authored
Merge branch 'main' into toggle_switch
2 parents 9897be0 + 8354de5 commit d537c3d

File tree

23 files changed

+2368
-2364
lines changed

23 files changed

+2368
-2364
lines changed

‎.changeset/four-dancers-dress.md‎

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

‎.changeset/nine-dragons-wave.md‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"@primer/css": minor
3+
---
4+
5+
Changing `PageLayout--isPaneSticky` to `PageLayout--sticky`.

‎.changeset/slow-poets-mate.md‎

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

‎.github/workflows/axe.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
fetch-depth: 0
1616
- name: Get changed files
1717
id: changed-files
18-
uses: tj-actions/changed-files@v18.6
18+
uses: tj-actions/changed-files@v19
1919
with:
2020
files: |
2121
docs/content/components/**/*.md

‎CHANGELOG.md‎

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

3+
## 20.1.1
4+
5+
### Patch Changes
6+
7+
- [#2078](https://github.com/primer/css/pull/2078) [`92ac0e39`](https://github.com/primer/css/commit/92ac0e39e6f5aae0314397890c8f78227a6c6ba0) Thanks [@langermank](https://github.com/langermank)! - Setup new `primer-primitive` bundle
8+
9+
## 20.1.0
10+
11+
### Minor Changes
12+
13+
- [#2072](https://github.com/primer/css/pull/2072) [`ab6f0840`](https://github.com/primer/css/commit/ab6f0840f0131b370fb8871551720afa20fb466e) Thanks [@JasonEtco](https://github.com/JasonEtco)! - Add `.text-capitalize` utility class
14+
15+
* [#1998](https://github.com/primer/css/pull/1998) [`51e087aa`](https://github.com/primer/css/commit/51e087aa31f049c1cb148df6f04fdbc6de434cf0) Thanks [@bolonio](https://github.com/bolonio)! - Styles for the new Dialog Component
16+
317
## 20.0.0
418

519
### Major Changes

‎docs/.storybook/main.js‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,9 @@ module.exports = {
88
'@whitespace/storybook-addon-html',
99
'storybook-addon-designs',
1010
'storybook-color-picker'
11-
]
11+
],
12+
framework: '@storybook/react',
13+
core: {
14+
builder: 'webpack5'
15+
}
1216
}

‎docs/.storybook/preview.js‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,17 @@ import '../../src/docs.scss'
22
import '../../src/index.scss'
33
import '../../src/base/index.scss'
44
import '../src/stories/helpers/storybook-styles.scss'
5+
// temporary import until primitives moves to core bundle
6+
// importing the index from /css didn't play nice with Storybook
7+
import '../../node_modules/@primer/primitives/tokens-v2-private/css/tokens/base/size/size.css'
8+
import '../../node_modules/@primer/primitives/tokens-v2-private/css/tokens/base/typography/typography.css'
9+
import '../../node_modules/@primer/primitives/tokens-v2-private/css/tokens/functional/size/border.css'
10+
import '../../node_modules/@primer/primitives/tokens-v2-private/css/tokens/functional/size/breakpoints.css'
11+
import '../../node_modules/@primer/primitives/tokens-v2-private/css/tokens/functional/size/size-coarse.css'
12+
import '../../node_modules/@primer/primitives/tokens-v2-private/css/tokens/functional/size/size-fine.css'
13+
import '../../node_modules/@primer/primitives/tokens-v2-private/css/tokens/functional/size/size.css'
14+
import '../../node_modules/@primer/primitives/tokens-v2-private/css/tokens/functional/size/viewport.css'
15+
import '../../node_modules/@primer/primitives/tokens-v2-private/css/tokens/functional/typography/typography.css'
516
import renderToHTML from '../src/stories/helpers/code-snippet-html-helper'
617

718
const customViewports = {

‎docs/gatsby-browser.js‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
// temporary import until primitives moves to core bundle
2+
// importing the index from /css didn't play nice with Gatsby
3+
import '../node_modules/@primer/primitives/tokens-v2-private/css/tokens/base/size/size.css'
4+
import '../node_modules/@primer/primitives/tokens-v2-private/css/tokens/base/typography/typography.css'
5+
import '../node_modules/@primer/primitives/tokens-v2-private/css/tokens/functional/size/border.css'
6+
import '../node_modules/@primer/primitives/tokens-v2-private/css/tokens/functional/size/breakpoints.css'
7+
import '../node_modules/@primer/primitives/tokens-v2-private/css/tokens/functional/size/size-coarse.css'
8+
import '../node_modules/@primer/primitives/tokens-v2-private/css/tokens/functional/size/size-fine.css'
9+
import '../node_modules/@primer/primitives/tokens-v2-private/css/tokens/functional/size/size.css'
10+
import '../node_modules/@primer/primitives/tokens-v2-private/css/tokens/functional/size/viewport.css'
11+
import '../node_modules/@primer/primitives/tokens-v2-private/css/tokens/functional/typography/typography.css'

‎docs/package.json‎

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@
1515
"@primer/gatsby-theme-doctocat": "3.1.1",
1616
"@primer/octicons": "17.0.0",
1717
"@primer/octicons-react": "17.0.0",
18-
"@primer/primitives": "7.3.0",
18+
"@primer/primitives": "7.8.3",
1919
"@svgr/webpack": "5.5.0",
2020
"autoprefixer": "10.4.2",
21-
"babel-preset-gatsby": "^2.11.1",
21+
"babel-preset-gatsby": "^2.14.0",
2222
"chroma-js": "^2.4.2",
2323
"clsx": "^1.1.1",
2424
"core-js": "^3.20.3",
@@ -28,7 +28,7 @@
2828
"gatsby-plugin-svgr": "2.1.0",
2929
"path": "0.12.7",
3030
"postcss": "8.4.5",
31-
"postcss-import": "14.0.2",
31+
"postcss-import": "14.1.0",
3232
"postcss-load-config": "3.1.0",
3333
"postcss-loader": "4.3.0",
3434
"postcss-scss": "4.0.3",
@@ -38,7 +38,7 @@
3838
"react": "^16.13.1",
3939
"react-dom": "^16.13.1",
4040
"react-frame-component": "^5.2.1",
41-
"sass-loader": "10.2.0",
41+
"sass-loader": "13.0.0",
4242
"styled-components": "^4.3.2",
4343
"title-case": "^3.0.3"
4444
},
@@ -47,16 +47,18 @@
4747
},
4848
"devDependencies": {
4949
"@babel/core": "^7.16.7",
50-
"@storybook/addon-a11y": "6.4.19",
51-
"@storybook/addon-actions": "^6.4.12",
52-
"@storybook/addon-essentials": "^6.4.12",
53-
"@storybook/addon-links": "^6.4.12",
50+
"@storybook/addon-a11y": "6.5.0",
51+
"@storybook/addon-actions": "^6.5.0",
52+
"@storybook/addon-essentials": "^6.5.0",
53+
"@storybook/addon-links": "^6.5.0",
5454
"@storybook/addon-postcss": "2.0.0",
55+
"@storybook/builder-webpack5": "^6.5.0",
56+
"@storybook/manager-webpack5": "^6.5.0",
5557
"@storybook/preset-scss": "^1.0.3",
56-
"@storybook/react": "6.4.19",
58+
"@storybook/react": "6.5.0",
5759
"@whitespace/storybook-addon-html": "^5.0.0",
58-
"babel-loader": "^8.2.3",
60+
"babel-loader": "^8.2.5",
5961
"storybook-addon-designs": "6.2.1",
60-
"storybook-color-picker": "2.3.0"
62+
"storybook-color-picker": "2.3.1"
6163
}
6264
}

‎docs/src/stories/components/Layout/LayoutBeta.stories.jsx‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -371,7 +371,6 @@ export const LayoutTemplate = ({
371371
paneWidth && layoutClassName + '--paneWidth-' + `${paneWidth}`,
372372
panePosition && layoutClassName + '--panePos-' + `${panePosition}`,
373373
hasPaneDivider && layoutClassName + '--hasPaneDivider',
374-
paneIsSticky && layoutClassName + '--isPaneSticky',
375374

376375
layoutClassName + '--responsive-' + `${responsiveVariant}`,
377376
responsiveVariant === 'separateRegions' && layoutClassName + '--responsive-primary-' + `${primaryRegion}`,
@@ -403,6 +402,7 @@ export const LayoutTemplate = ({
403402
className={clsx(
404403
layoutClassName + '-region',
405404
layoutClassName + '-pane',
405+
paneIsSticky && layoutClassName + '-pane--sticky',
406406
paneDividerWhenNarrow &&
407407
layoutClassName +
408408
'-region--dividerNarrow-' +
@@ -433,6 +433,7 @@ export const LayoutTemplate = ({
433433
className={clsx(
434434
layoutClassName + '-region',
435435
layoutClassName + '-pane',
436+
paneIsSticky && layoutClassName + '-pane--sticky',
436437
paneDividerWhenNarrow &&
437438
layoutClassName +
438439
'-region--dividerNarrow-' +

0 commit comments

Comments
 (0)