Skip to content

Commit c57737e

Browse files
dylanatsmithdylanatsmith
authored
Merge branch 'main' into markdown-img-bg
2 parents c2abf77 + c078252 commit c57737e

30 files changed

+382
-682
lines changed

‎docs/package-lock.json

+116-140
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package-lock.json

+177-536
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,8 @@
4141
"build:storybook": "cd docs && npm i && npm run build:storybook"
4242
},
4343
"dependencies": {
44-
"@primer/primitives": "^8.2.0",
45-
"@primer/view-components": "^0.30.0"
44+
"@primer/primitives": "^9.0.3",
45+
"@primer/view-components": "^0.33.0"
4646
},
4747
"devDependencies": {
4848
"@changesets/changelog-github": "^0.5.0",

‎src/autocomplete/suggester.scss

+7
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,17 @@
1212
list-style: none;
1313
cursor: pointer;
1414
background: var(--overlay-bgColor, var(--color-canvas-overlay));
15+
// stylelint-disable-next-line primer/borders
1516
border: $border-width $border-style var(--borderColor-default, var(--color-border-default));
17+
// stylelint-disable-next-line primer/borders
1618
border-radius: $border-radius;
1719
box-shadow: var(--shadow-resting-medium, var(--color-shadow-medium));
1820

1921
li {
2022
display: block;
2123
padding: var(--base-size-4) var(--base-size-8);
2224
font-weight: $font-weight-semibold;
25+
// stylelint-disable-next-line primer/borders
2326
border-bottom: $border-width $border-style var(--borderColor-muted, var(--color-border-muted));
2427

2528
small {
@@ -29,12 +32,16 @@
2932

3033
&:last-child {
3134
border-bottom: 0;
35+
// stylelint-disable-next-line primer/borders
3236
border-bottom-right-radius: $border-radius;
37+
// stylelint-disable-next-line primer/borders
3338
border-bottom-left-radius: $border-radius;
3439
}
3540

3641
&:first-child {
42+
// stylelint-disable-next-line primer/borders
3743
border-top-left-radius: $border-radius;
44+
// stylelint-disable-next-line primer/borders
3845
border-top-right-radius: $border-radius;
3946
}
4047

‎src/base/base.scss

+2
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,7 @@ hr,
6161
overflow: hidden;
6262
background: transparent;
6363
border: 0;
64+
// stylelint-disable-next-line primer/borders
6465
border-bottom: $border-width $border-style var(--borderColor-muted, var(--color-border-muted));
6566

6667
@include clearfix();
@@ -72,6 +73,7 @@ hr,
7273

7374
table {
7475
border-spacing: 0;
76+
// stylelint-disable-next-line primer/borders
7577
border-collapse: collapse;
7678
}
7779

‎src/base/kbd.scss

+1
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ kbd {
1313
// stylelint-disable-next-line primer/borders
1414
border: $border-style $border-width var(--borderColor-neutral-muted, var(--color-neutral-muted));
1515
border-bottom-color: var(--borderColor-neutral-muted, var(--color-neutral-muted));
16+
// stylelint-disable-next-line primer/borders
1617
border-radius: $border-radius;
1718
// stylelint-disable-next-line primer/box-shadow
1819
box-shadow: inset 0 -1px 0 var(--borderColor-neutral-muted, var(--color-neutral-muted));

‎src/box/box-overlay.scss

+3
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,11 @@
1212
.Box-header {
1313
margin: 0;
1414
border-width: 0;
15+
// stylelint-disable-next-line primer/borders
1516
border-bottom-width: $border-width;
17+
// stylelint-disable-next-line primer/borders
1618
border-top-left-radius: $border-radius;
19+
// stylelint-disable-next-line primer/borders
1720
border-top-right-radius: $border-radius;
1821
}
1922
}

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

+1
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
color: var(--fgColor-muted, var(--color-fg-muted));
1111
word-break: break-all;
1212
background-color: var(--bgColor-accent-muted, var(--color-accent-subtle));
13+
// stylelint-disable-next-line primer/borders
1314
border-radius: $border-radius;
1415

1516
.octicon {

‎src/buttons/button-group.scss

+12
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,18 @@
2323
border-radius: 0;
2424

2525
&:first-child {
26+
// stylelint-disable-next-line primer/borders
2627
border-top-left-radius: $border-radius;
28+
// stylelint-disable-next-line primer/borders
2729
border-bottom-left-radius: $border-radius;
2830
}
2931

3032
&:last-child {
33+
// stylelint-disable-next-line primer/borders
3134
border-right-width: $border-width;
35+
// stylelint-disable-next-line primer/borders
3236
border-top-right-radius: $border-radius;
37+
// stylelint-disable-next-line primer/borders
3338
border-bottom-right-radius: $border-radius;
3439
}
3540

@@ -38,6 +43,7 @@
3843
&:focus,
3944
&:active,
4045
&:hover {
46+
// stylelint-disable-next-line primer/borders
4147
border-right-width: $border-width;
4248

4349
+ .BtnGroup-item,
@@ -51,13 +57,18 @@
5157
float: left;
5258

5359
&:first-child .BtnGroup-item {
60+
// stylelint-disable-next-line primer/borders
5461
border-top-left-radius: $border-radius;
62+
// stylelint-disable-next-line primer/borders
5563
border-bottom-left-radius: $border-radius;
5664
}
5765

5866
&:last-child .BtnGroup-item {
67+
// stylelint-disable-next-line primer/borders
5968
border-right-width: $border-width;
69+
// stylelint-disable-next-line primer/borders
6070
border-top-right-radius: $border-radius;
71+
// stylelint-disable-next-line primer/borders
6172
border-bottom-right-radius: $border-radius;
6273
}
6374

@@ -72,6 +83,7 @@
7283
&:active,
7384
&:hover {
7485
.BtnGroup-item {
86+
// stylelint-disable-next-line primer/borders
7587
border-right-width: $border-width;
7688
}
7789

‎src/buttons/button.scss

+2
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,9 @@
1414
vertical-align: middle;
1515
cursor: pointer;
1616
user-select: none;
17+
// stylelint-disable-next-line primer/borders
1718
border: $border-width $border-style;
19+
// stylelint-disable-next-line primer/borders
1820
border-radius: $border-radius;
1921
appearance: none; // Corrects inability to style clickable `input` types in iOS.
2022

‎src/buttons/misc.scss

+6
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232
&:not(.dropdown-item) {
3333
&:focus,
3434
&:focus-visible {
35+
// stylelint-disable-next-line primer/borders
3536
border-radius: $border-radius;
3637
outline-offset: 0;
3738
}
@@ -45,6 +46,7 @@
4546
color: var(--fgColor-accent, var(--color-accent-fg));
4647
background-color: transparent; // Reset default gradient backgrounds and colors
4748
border: 0;
49+
// stylelint-disable-next-line primer/borders
4850
border-radius: $border-radius;
4951
box-shadow: none;
5052

@@ -103,6 +105,7 @@
103105

104106
&:focus,
105107
&:focus-visible {
108+
// stylelint-disable-next-line primer/borders
106109
border-radius: $border-radius;
107110
}
108111

@@ -214,9 +217,12 @@
214217
color: var(--fgColor-default, var(--color-fg-default));
215218
vertical-align: middle;
216219
background-color: var(--bgColor-default, var(--color-canvas-default));
220+
// stylelint-disable-next-line primer/borders
217221
border: $border-width $border-style var(--button-default-borderColor-rest, var(--color-btn-border));
218222
border-left: 0;
223+
// stylelint-disable-next-line primer/borders
219224
border-top-right-radius: $border-radius;
225+
// stylelint-disable-next-line primer/borders
220226
border-bottom-right-radius: $border-radius;
221227
box-shadow: var(--shadow-resting-small, var(--color-shadow-small)), var(--shadow-highlight, var(--color-primer-shadow-highlight));
222228

‎src/forms/form-control.scss

+6
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,9 @@
1717
background-color: var(--bgColor-default, var(--color-canvas-default));
1818
background-repeat: no-repeat; // Repeat and position set for form states (success, error, etc)
1919
background-position: right 8px center; // For form validation. This keeps images 8px from right and centered vertically.
20+
// stylelint-disable-next-line primer/borders
2021
border: $border-width $border-style var(--control-borderColor-rest, var(--color-border-default));
22+
// stylelint-disable-next-line primer/borders
2123
border-radius: $border-radius;
2224
box-shadow: var(--shadow-inset, var(--color-primer-shadow-inset));
2325
transition: 80ms cubic-bezier(0.33, 1, 0.68, 1);
@@ -43,6 +45,7 @@
4345
&.border-0 {
4446
&:focus,
4547
&:focus-visible {
48+
// stylelint-disable-next-line primer/borders
4649
border: $border-width $border-style var(--borderColor-accent-emphasis, var(--color-accent-fg)) !important;
4750
}
4851
}
@@ -143,6 +146,7 @@ textarea.form-control {
143146
padding: 2px var(--base-size-4);
144147
font-style: normal;
145148
background: var(--bgColor-attention-muted, var(--color-attention-subtle));
149+
// stylelint-disable-next-line primer/borders
146150
border-radius: $border-radius;
147151
}
148152
}
@@ -254,7 +258,9 @@ input::-webkit-inner-spin-button {
254258
font-size: $h5-size;
255259
color: var(--fgColor-attention, var(--color-attention-fg));
256260
background: var(--bgColor-attention-muted, var(--color-attention-subtle));
261+
// stylelint-disable-next-line primer/borders
257262
border: $border-width $border-style var(--borderColor-attention-emphasis, var(--color-attention-emphasis));
263+
// stylelint-disable-next-line primer/borders
258264
border-radius: $border-radius;
259265

260266
p {

‎src/forms/form-group.scss

+3
Original file line numberDiff line numberDiff line change
@@ -176,8 +176,11 @@
176176
margin: var(--base-size-8) 0 0;
177177
font-size: $font-size-small;
178178
font-weight: $font-weight-normal;
179+
// stylelint-disable-next-line primer/borders
179180
border-style: $border-style;
181+
// stylelint-disable-next-line primer/borders
180182
border-width: $border-width;
183+
// stylelint-disable-next-line primer/borders
181184
border-radius: $border-radius;
182185

183186
&::after,

‎src/forms/radio-group.scss

+5
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
line-height: 20px; // Specifically not inherit our `<body>` default
1616
color: var(--fgColor-default, var(--color-fg-default));
1717
cursor: pointer;
18+
// stylelint-disable-next-line primer/borders
1819
border: $border-width $border-style var(--borderColor-default, var(--color-border-default));
1920

2021
:checked + & {
@@ -25,12 +26,16 @@
2526

2627
&:first-of-type {
2728
margin-left: 0;
29+
// stylelint-disable-next-line primer/borders
2830
border-top-left-radius: $border-radius;
31+
// stylelint-disable-next-line primer/borders
2932
border-bottom-left-radius: $border-radius;
3033
}
3134

3235
&:last-of-type {
36+
// stylelint-disable-next-line primer/borders
3337
border-top-right-radius: $border-radius;
38+
// stylelint-disable-next-line primer/borders
3439
border-bottom-right-radius: $border-radius;
3540
}
3641

‎src/header/header.scss

+1
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@
3737
.Header-input {
3838
color: var(--header-fgColor-default, var(--color-header-text));
3939
background-color: var(--headerSearch-bgColor, var(--color-header-search-bg));
40+
// stylelint-disable-next-line primer/borders
4041
border: $border-width $border-style var(--headerSearch-borderColor, var(--color-header-search-border));
4142
box-shadow: none;
4243

‎src/labels/mixins.scss

+2
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,9 @@
1212
font-weight: $font-weight-semibold;
1313
line-height: 18px;
1414
white-space: nowrap;
15+
// stylelint-disable-next-line primer/borders
1516
border: $border-width $border-style transparent;
17+
// stylelint-disable-next-line primer/borders
1618
border-radius: 2em;
1719
}
1820

‎src/layout/app-frame.scss

-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
// stylelint-disable max-nesting-depth
22
// stylelint-disable primer/spacing
3-
// stylelint-disable primer/borders
43

54
.AppFrame {
65

‎src/layout/stack.scss

+2-2
Original file line numberDiff line numberDiff line change
@@ -161,14 +161,14 @@
161161

162162
:not(.Stack--dir-inline#{$viewportRange}) > .Stack-divider,
163163
:not(.Stack--dir-inline#{$viewportRange}) > .Stack-item > .Stack-divider {
164-
border-block-end: var(--borderWidth-thin, 1px) solid var(--Stack-divider-color);
164+
border-block-end: var(--borderWidth-thin, var(--borderWidth-thin)) solid var(--Stack-divider-color);
165165
inline-size: auto;
166166
block-size: 0;
167167
}
168168

169169
.Stack--dir-inline#{$viewportRange} > .Stack-divider,
170170
.Stack--dir-inline#{$viewportRange} > .Stack-item > .Stack-divider {
171-
border-inline-end: var(--borderWidth-thin, 1px) solid var(--Stack-divider-color);
171+
border-inline-end: var(--borderWidth-thin, var(--borderWidth-thin)) solid var(--Stack-divider-color);
172172
inline-size: 0;
173173
block-size: auto;
174174
}

‎src/markdown/code.scss

+2
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
font-size: 85%;
1111
white-space: break-spaces; // keeps rendering spaces, but breaks them onto multiple lines
1212
background-color: var(--bgColor-neutral-muted, var(--color-neutral-muted));
13+
// stylelint-disable-next-line primer/borders
1314
border-radius: $border-radius;
1415

1516
br { display: none; }
@@ -60,6 +61,7 @@
6061
line-height: 1.45;
6162
color: var(--fgColor-default, var(--color-fg-default));
6263
background-color: var(--bgColor-muted, var(--color-canvas-subtle));
64+
// stylelint-disable-next-line primer/borders
6365
border-radius: $border-radius;
6466
}
6567

‎src/markdown/footnotes.scss

+2
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
.footnotes {
1616
font-size: $h6-size;
1717
color: var(--fgColor-muted, var(--color-fg-muted));
18+
// stylelint-disable-next-line primer/borders
1819
border-top: $border;
1920

2021
ol {
@@ -41,6 +42,7 @@
4142
content: '';
4243
// stylelint-disable-next-line primer/borders
4344
border: 2px $border-style var(--borderColor-accent-emphasis, var(--color-accent-emphasis));
45+
// stylelint-disable-next-line primer/borders
4446
border-radius: $border-radius;
4547
}
4648

‎src/markdown/headings.scss

+2
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@
4141
padding-bottom: 0.3em;
4242
// stylelint-disable-next-line primer/typography
4343
font-size: 2em;
44+
// stylelint-disable-next-line primer/borders
4445
border-bottom: $border-width $border-style var(--borderColor-muted, var(--color-border-muted));
4546
}
4647

@@ -49,6 +50,7 @@
4950
padding-bottom: 0.3em;
5051
// stylelint-disable-next-line primer/typography
5152
font-size: 1.5em;
53+
// stylelint-disable-next-line primer/borders
5254
border-bottom: $border-width $border-style var(--borderColor-muted, var(--color-border-muted));
5355
}
5456

‎src/markdown/images.scss

+1
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@
4343
// stylelint-disable-next-line primer/spacing
4444
margin: 13px 0 0;
4545
overflow: hidden;
46+
// stylelint-disable-next-line primer/borders
4647
border: $border-width $border-style var(--borderColor-default, var(--color-border-default));
4748
}
4849

‎src/markdown/tables.scss

+2
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
td {
1818
// stylelint-disable-next-line primer/spacing
1919
padding: 6px 13px;
20+
// stylelint-disable-next-line primer/borders
2021
border: $border-width $border-style var(--borderColor-default, var(--color-border-default));
2122
}
2223

@@ -28,6 +29,7 @@
2829

2930
tr {
3031
background-color: var(--bgColor-default, var(--color-canvas-default));
32+
// stylelint-disable-next-line primer/borders
3133
border-top: $border-width $border-style var(--borderColor-muted, var(--color-border-muted));
3234

3335
&:nth-child(2n) {

‎src/navigation/filter-list.scss

+1
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@
3535
text-overflow: ellipsis;
3636
white-space: nowrap;
3737
cursor: pointer;
38+
// stylelint-disable-next-line primer/borders
3839
border-radius: $border-radius;
3940

4041
&:hover {

‎src/navigation/sidenav.scss

+1
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
text-align: left;
1717
background-color: transparent;
1818
border: 0;
19+
// stylelint-disable-next-line primer/borders
1920
border-top: $border-width $border-style var(--borderColor-muted, var(--color-border-muted));
2021

2122
&:first-child {

0 commit comments

Comments
 (0)