Skip to content

Commit 1e65033

Browse files
langermanklangermank
committed
swapsies
1 parent 4113637 commit 1e65033

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+345
-652
lines changed

‎.vscode/extensions.json

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
{
2+
"recommendations": ["phoenisx.cssvar"],
3+
// List of extensions recommended by VS Code that should not be recommended for users of this workspace.
4+
"unwantedRecommendations": []
5+
}

‎.vscode/settings.json

+27
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
{
2+
"typescript.tsdk": "node_modules/typescript/lib",
3+
"editor.formatOnSave": true,
4+
"[postcss]": {
5+
"editor.defaultFormatter": "esbenp.prettier-vscode",
6+
"editor.formatOnSave": true,
7+
"editor.codeActionsOnSave": {
8+
"source.fixAll.stylelint": "explicit"
9+
}
10+
},
11+
"stylelint.validate": [
12+
"css",
13+
"scss"
14+
],
15+
"cssvar.ignore": [
16+
// exclude all but light theme, to avoid stacking suggestions
17+
"node_modules/@primer/primitives/dist/css/functional/themes/dark-colorblind.css",
18+
"node_modules/@primer/primitives/dist/css/functional/themes/dark-dimmed.css",
19+
"node_modules/@primer/primitives/dist/css/functional/themes/dark-high-contrast.css",
20+
"node_modules/@primer/primitives/dist/css/functional/themes/dark-tritanopia.css",
21+
"node_modules/@primer/primitives/dist/css/functional/themes/dark.css",
22+
"node_modules/@primer/primitives/dist/css/functional/themes/light-colorblind.css",
23+
"node_modules/@primer/primitives/dist/css/functional/themes/light-high-contrast.css",
24+
"node_modules/@primer/primitives/dist/css/functional/themes/light-tritanopia.css"
25+
],
26+
"cssvar.files": ["node_modules/@primer/primitives/dist/css/**/*.css"]
27+
}

‎src/autocomplete/suggester.scss

+9-18
Original file line numberDiff line numberDiff line change
@@ -12,39 +12,30 @@
1212
list-style: none;
1313
cursor: pointer;
1414
background: var(--overlay-bgColor, var(--color-canvas-overlay));
15-
// stylelint-disable-next-line primer/borders, primer/colors
16-
border: $border-width $border-style var(--borderColor-default, var(--color-border-default));
17-
// stylelint-disable-next-line primer/borders
18-
border-radius: $border-radius;
15+
border: var(--borderWidth-default) solid var(--borderColor-default, var(--color-border-default));
16+
border-radius: var(--borderRadius-default);
1917
box-shadow: var(--shadow-resting-medium, var(--color-shadow-medium));
2018

2119
li {
2220
display: block;
2321
padding: var(--base-size-4) var(--base-size-8);
24-
// stylelint-disable-next-line primer/typography
25-
font-weight: $font-weight-semibold;
26-
// stylelint-disable-next-line primer/borders, primer/colors
27-
border-bottom: $border-width $border-style var(--borderColor-muted, var(--color-border-muted));
22+
font-weight: var(--base-text-weight-light);
23+
border-bottom: var(--borderWidth-default) solid var(--borderColor-muted, var(--color-border-muted));
2824

2925
small {
30-
// stylelint-disable-next-line primer/typography
31-
font-weight: $font-weight-normal;
26+
font-weight: var(--base-text-weight-light);
3227
color: var(--fgColor-muted, var(--color-fg-muted));
3328
}
3429

3530
&:last-child {
3631
border-bottom: 0;
37-
// stylelint-disable-next-line primer/borders
38-
border-bottom-right-radius: $border-radius;
39-
// stylelint-disable-next-line primer/borders
40-
border-bottom-left-radius: $border-radius;
32+
border-bottom-right-radius: var(--borderRadius-default);
33+
border-bottom-left-radius: var(--borderRadius-default);
4134
}
4235

4336
&:first-child {
44-
// stylelint-disable-next-line primer/borders
45-
border-top-left-radius: $border-radius;
46-
// stylelint-disable-next-line primer/borders
47-
border-top-right-radius: $border-radius;
37+
border-top-left-radius: var(--borderRadius-default);
38+
border-top-right-radius: var(--borderRadius-default);
4839
}
4940

5041
&:hover {

‎src/avatars/avatar-parent-child.scss

+1-2
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
right: -15%;
1212
bottom: -9%;
1313
background-color: var(--bgColor-default, var(--color-canvas-default)); // For transparent backgrounds
14-
// stylelint-disable-next-line primer/borders
15-
border-radius: $border-radius-1;
14+
border-radius: var(--borderRadius-default);;
1615
box-shadow: var(--avatar-shadow, var(--color-avatar-child-shadow));
1716
}

‎src/avatars/circle-badge.scss

+1-2
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,7 @@
4545
left: 0;
4646
width: 100%;
4747
content: '';
48-
// stylelint-disable-next-line primer/borders
49-
border-bottom: 2px dashed var(--borderColor-default, var(--color-border-default));
48+
border-bottom: var(--borderWidth-thick) dashed var(--borderColor-default, var(--color-border-default));
5049
}
5150

5251
.CircleBadge {

‎src/base/base.scss

+7-10
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@ button {
1313
}
1414

1515
body {
16-
font-family: $body-font;
17-
font-size: var(--body-font-size, $body-font-size);
18-
line-height: $body-line-height;
16+
font-family: var(--fontStack-sansSerif);
17+
font-size: var(--body-font-size);
18+
line-height: 1.5;
1919
color: var(--fgColor-default, var(--color-fg-default));
2020
background-color: var(--bgColor-default, var(--color-canvas-default));
2121
}
@@ -31,7 +31,7 @@ a {
3131

3232
b,
3333
strong {
34-
font-weight: $font-weight-bold;
34+
font-weight: var(--base-text-weight-semibold);
3535
}
3636

3737
fieldset {
@@ -41,7 +41,7 @@ fieldset {
4141
}
4242

4343
label {
44-
font-weight: $font-weight-bold;
44+
font-weight: var(--base-text-weight-semibold);
4545
}
4646

4747
// Custom styling for HTML5 validation bubbles (WebKit only)
@@ -56,13 +56,11 @@ label {
5656
hr,
5757
.rule {
5858
height: 0;
59-
// stylelint-disable-next-line primer/spacing
60-
margin: 15px 0;
59+
margin: var(--base-size-16) 0;
6160
overflow: hidden;
6261
background: transparent;
6362
border: 0;
64-
// stylelint-disable-next-line primer/borders, primer/colors
65-
border-bottom: $border-width $border-style var(--borderColor-muted, var(--color-border-muted));
63+
border-bottom: var(--borderWidth-default) solid var(--borderColor-muted, var(--color-border-muted));
6664

6765
@include clearfix();
6866
}
@@ -73,7 +71,6 @@ hr,
7371

7472
table {
7573
border-spacing: 0;
76-
// stylelint-disable-next-line primer/borders
7774
border-collapse: collapse;
7875
}
7976

‎src/base/kbd.scss

+7-7
Original file line numberDiff line numberDiff line change
@@ -4,18 +4,18 @@
44
kbd {
55
display: inline-block;
66
padding: var(--base-size-4);
7-
// stylelint-disable-next-line primer/typography, declaration-property-value-no-unknown
8-
font: 11px $mono-font;
9-
// stylelint-disable-next-line primer/typography
7+
, declaration-property-value-no-unknown
8+
font: 11px var(--fontStack-monospace);
9+
1010
line-height: 10px;
1111
color: var(--fgColor-default, var(--color-fg-default));
1212
vertical-align: middle;
1313
background-color: var(--bgColor-muted, var(--color-canvas-subtle));
14-
// stylelint-disable-next-line primer/borders, primer/colors
15-
border: $border-style $border-width var(--borderColor-neutral-muted, var(--color-neutral-muted));
14+
15+
border: $border-style var(--borderWidth-default) var(--borderColor-neutral-muted, var(--color-neutral-muted));
1616
border-bottom-color: var(--borderColor-neutral-muted, var(--color-neutral-muted));
17-
// stylelint-disable-next-line primer/borders
18-
border-radius: $border-radius;
17+
18+
border-radius: var(--borderRadius-default);
1919
// stylelint-disable-next-line primer/box-shadow
2020
box-shadow: inset 0 -1px 0 var(--borderColor-neutral-muted, var(--color-neutral-muted));
2121
}

‎src/base/normalize.scss

+2-2
Original file line numberDiff line numberDiff line change
@@ -261,7 +261,7 @@ textarea {
261261
*/
262262

263263
optgroup {
264-
font-weight: $font-weight-bold;
264+
font-weight: var(--base-text-weight-semibold);
265265
}
266266

267267
/**
@@ -304,7 +304,7 @@ html [type="button"], /* 1 */
304304
*/
305305

306306
fieldset {
307-
border: $border-width $border-style #c0c0c0;
307+
border: var(--borderWidth-default) solid #c0c0c0;
308308
margin: 0 2px;
309309
padding: 0.35em 0.625em $em-spacer-6;
310310
}

‎src/base/typography-base.scss

+7-10
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,13 @@ h6 { @include h6; }
2323

2424
p {
2525
margin-top: 0;
26-
// stylelint-disable-next-line primer/spacing
26+
27+
/* stylelint-disable-next-line primer/spacing */
2728
margin-bottom: 10px;
2829
}
2930

3031
small {
31-
// stylelint-disable-next-line primer/typography
32+
/* stylelint-disable-next-line primer/typography */
3233
font-size: 90%;
3334
}
3435

@@ -68,19 +69,15 @@ dd {
6869
tt,
6970
code,
7071
samp {
71-
// stylelint-disable-next-line primer/typography
72-
font-family: $mono-font;
73-
// stylelint-disable-next-line primer/typography
74-
font-size: $font-size-small;
72+
font-family: var(--fontStack-monospace);
73+
font-size: var(--text-body-size-small);
7574
}
7675

7776
pre {
7877
margin-top: 0;
7978
margin-bottom: 0;
80-
// stylelint-disable-next-line primer/typography
81-
font-family: $mono-font;
82-
// stylelint-disable-next-line primer/typography
83-
font-size: $font-size-small;
79+
font-family: var(--fontStack-monospace);
80+
font-size: var(--text-body-size-small);
8481
}
8582

8683
// Octicons

‎src/box/box-overlay.scss

+3-6
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,9 @@
1212
.Box-header {
1313
margin: 0;
1414
border-width: 0;
15-
// stylelint-disable-next-line primer/borders
16-
border-bottom-width: $border-width;
17-
// stylelint-disable-next-line primer/borders
18-
border-top-left-radius: $border-radius;
19-
// stylelint-disable-next-line primer/borders
20-
border-top-right-radius: $border-radius;
15+
border-bottom-width: var(--borderWidth-default);
16+
border-top-left-radius: var(--borderRadius-default);
17+
border-top-right-radius: var(--borderRadius-default);
2118
}
2219
}
2320

‎src/branch-name/branch-name.scss

+6-6
Original file line numberDiff line numberDiff line change
@@ -4,18 +4,18 @@
44

55
.branch-name {
66
display: inline-block;
7-
// stylelint-disable-next-line primer/spacing
7+
88
padding: 2px 6px;
9-
// stylelint-disable-next-line primer/typography, declaration-property-value-no-unknown
10-
font: 12px $mono-font;
9+
, declaration-property-value-no-unknown
10+
font: 12px var(--fontStack-monospace);
1111
color: var(--fgColor-muted, var(--color-fg-muted));
1212
word-break: break-all;
1313
background-color: var(--bgColor-accent-muted, var(--color-accent-subtle));
14-
// stylelint-disable-next-line primer/borders
15-
border-radius: $border-radius;
14+
15+
border-radius: var(--borderRadius-default);
1616

1717
.octicon {
18-
// stylelint-disable-next-line primer/spacing
18+
1919
margin: 1px -2px 0 0;
2020
color: var(--fgColor-muted, var(--color-fg-muted));
2121
}

‎src/buttons/button-group.scss

+12-24
Original file line numberDiff line numberDiff line change
@@ -23,28 +23,22 @@
2323
border-radius: 0;
2424

2525
&:first-child {
26-
// stylelint-disable-next-line primer/borders
27-
border-top-left-radius: $border-radius;
28-
// stylelint-disable-next-line primer/borders
29-
border-bottom-left-radius: $border-radius;
26+
border-top-left-radius: var(--borderRadius-default);
27+
border-bottom-left-radius: var(--borderRadius-default);
3028
}
3129

3230
&:last-child {
33-
// stylelint-disable-next-line primer/borders
34-
border-right-width: $border-width;
35-
// stylelint-disable-next-line primer/borders
36-
border-top-right-radius: $border-radius;
37-
// stylelint-disable-next-line primer/borders
38-
border-bottom-right-radius: $border-radius;
31+
border-right-width: var(--borderWidth-default);
32+
border-top-right-radius: var(--borderRadius-default);
33+
border-bottom-right-radius: var(--borderRadius-default);
3934
}
4035

4136
&.selected,
4237
&[aria-selected='true'],
4338
&:focus,
4439
&:active,
4540
&:hover {
46-
// stylelint-disable-next-line primer/borders
47-
border-right-width: $border-width;
41+
border-right-width: var(--borderWidth-default);
4842

4943
+ .BtnGroup-item,
5044
+ .BtnGroup-parent .BtnGroup-item {
@@ -57,19 +51,14 @@
5751
float: left;
5852

5953
&:first-child .BtnGroup-item {
60-
// stylelint-disable-next-line primer/borders
61-
border-top-left-radius: $border-radius;
62-
// stylelint-disable-next-line primer/borders
63-
border-bottom-left-radius: $border-radius;
54+
border-top-left-radius: var(--borderRadius-default);
55+
border-bottom-left-radius: var(--borderRadius-default);
6456
}
6557

6658
&:last-child .BtnGroup-item {
67-
// stylelint-disable-next-line primer/borders
68-
border-right-width: $border-width;
69-
// stylelint-disable-next-line primer/borders
70-
border-top-right-radius: $border-radius;
71-
// stylelint-disable-next-line primer/borders
72-
border-bottom-right-radius: $border-radius;
59+
border-right-width: var(--borderWidth-default);
60+
border-top-right-radius: var(--borderRadius-default);
61+
border-bottom-right-radius: var(--borderRadius-default);
7362
}
7463

7564
.BtnGroup-item {
@@ -83,8 +72,7 @@
8372
&:active,
8473
&:hover {
8574
.BtnGroup-item {
86-
// stylelint-disable-next-line primer/borders
87-
border-right-width: $border-width;
75+
border-right-width: var(--borderWidth-default);
8876
}
8977

9078
+ .BtnGroup-item,

0 commit comments

Comments
 (0)