Skip to content

Commit 73caaad

Browse files
Update to the latest version of Primer (#242)
* Update dependencies * Fix container * Change dev container
1 parent 00ef7ab commit 73caaad

File tree

5 files changed

+101
-633
lines changed

5 files changed

+101
-633
lines changed

.devcontainer/devcontainer.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,9 @@
2424
// "forwardPorts": [],
2525

2626
// Use 'postCreateCommand' to run commands after the container is created.
27-
"postCreateCommand": "yarn install",
27+
"postCreateCommand": "nvm install --default && nvm use --default && yarn install",
28+
29+
"postStartCommand": "yarn dev",
2830

2931
// Comment out connect as root instead. More info: https://aka.ms/vscode-remote/containers/non-root.
3032
"remoteUser": "node"

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
"@generouted/react-router": "^1.19.11",
1414
"@primer/octicons-react": "^19.11.0",
1515
"@primer/primitives": "^10.0.0",
16-
"@primer/react": "^36.27.0",
16+
"@primer/react": "^37.26.0",
1717
"react": "^18.3.1",
1818
"react-dom": "^18.3.1",
1919
"react-is": "^18.3.1",

src/globals.css

Lines changed: 19 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
@import "@primer/primitives/dist/css/base/size/size.css";
2-
@import "@primer/primitives/dist/css/base/typography/typography.css";
3-
@import "@primer/primitives/dist/css/base/motion/motion.css";
4-
@import "@primer/primitives/dist/css/functional/size/border.css";
5-
@import "@primer/primitives/dist/css/functional/size/breakpoints.css";
6-
@import "@primer/primitives/dist/css/functional/size/size-coarse.css";
7-
@import "@primer/primitives/dist/css/functional/size/size-fine.css";
8-
@import "@primer/primitives/dist/css/functional/size/size.css";
9-
@import "@primer/primitives/dist/css/functional/size/viewport.css";
10-
@import "@primer/primitives/dist/css/functional/typography/typography.css";
1+
@import '@primer/primitives/dist/css/base/size/size.css';
2+
@import '@primer/primitives/dist/css/base/typography/typography.css';
3+
@import '@primer/primitives/dist/css/base/motion/motion.css';
4+
@import '@primer/primitives/dist/css/functional/size/border.css';
5+
@import '@primer/primitives/dist/css/functional/size/breakpoints.css';
6+
@import '@primer/primitives/dist/css/functional/size/size-coarse.css';
7+
@import '@primer/primitives/dist/css/functional/size/size-fine.css';
8+
@import '@primer/primitives/dist/css/functional/size/size.css';
9+
@import '@primer/primitives/dist/css/functional/size/viewport.css';
10+
@import '@primer/primitives/dist/css/functional/typography/typography.css';
1111

1212
@import '@primer/primitives/dist/css/functional/themes/light.css';
1313
@import '@primer/primitives/dist/css/functional/themes/light-tritanopia.css';
@@ -22,29 +22,25 @@
2222
/* @import "./github-markdown.css"; */
2323

2424
h1 {
25-
font-size: var(--text-title-size-large);
26-
line-height: var(--text-title-lineHeight-large);
27-
font-weight: var(--text-title-weight-large);
25+
font-size: var(--text-title-size-large);
26+
line-height: var(--text-title-lineHeight-large);
27+
font-weight: var(--text-title-weight-large);
2828
}
2929

3030
h2 {
31-
font-size: var(--text-title-size-medium);
32-
line-height: var(--text-title-lineHeight-medium);
33-
font-weight: var(--text-title-weight-medium);
31+
font-size: var(--text-title-size-medium);
32+
line-height: var(--text-title-lineHeight-medium);
33+
font-weight: var(--text-title-weight-medium);
3434
}
3535

3636
p,
3737
span,
3838
li {
39-
font-size: var(--text-body-size-medium);
40-
line-height: var(--text-body-lineHeight-large);
41-
}
42-
43-
body {
44-
overflow: hidden;
39+
font-size: var(--text-body-size-medium);
40+
line-height: var(--text-body-lineHeight-large);
4541
}
4642

4743
#root,
4844
#root > div {
49-
min-height: 100vh
45+
min-height: 100vh;
5046
}

src/pages/index.jsx

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { Link, Octicon } from '@primer/react'
1+
import { Link } from '@primer/react'
22
import {
33
MarkGithubIcon,
44
CheckIcon,
@@ -29,7 +29,7 @@ function Playground() {
2929
icon={CheckIcon}
3030
iconColor="var(--fgColor-success)"
3131
>
32-
Mona's playground successfully initialised...
32+
Mona's playground successfully initialised...
3333
</CodeLine>
3434
<CodeLine
3535
icon={CommentIcon}
@@ -57,10 +57,11 @@ function Playground() {
5757
}
5858

5959
function CodeLine({ icon, iconColor, children }) {
60+
const Icon = icon
6061
return (
6162
<li className={styles.codeline}>
6263
<div className={styles.codelineIcon} style={{ color: iconColor }}>
63-
<Octicon icon={icon} size={16} />
64+
<Icon size={16} />
6465
</div>
6566
<div className={styles.codelineText}>{children}</div>
6667
</li>
@@ -71,11 +72,7 @@ function Footer() {
7172
return (
7273
<footer className={styles.footer}>
7374
<div className={styles.tip}>
74-
<Octicon
75-
icon={MortarBoardIcon}
76-
size={16}
77-
className={styles.tipIcon}
78-
/>
75+
<MortarBoardIcon size={16} className={styles.tipIcon} />
7976
<span>Tip</span>
8077
</div>
8178

0 commit comments

Comments
 (0)