Skip to content

Commit

Permalink
Merge branch 'main' into label-stories
Browse files Browse the repository at this point in the history
  • Loading branch information
jonrohan authored Oct 28, 2021
2 parents 55d883b + bc50203 commit bb98f73
Show file tree
Hide file tree
Showing 59 changed files with 234 additions and 222 deletions.
5 changes: 5 additions & 0 deletions .changeset/cyan-birds-help.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@primer/css": patch
---

Updating @primer/stylelint-config to 12.1.0
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
"@changesets/cli": "2.17.0",
"@github/prettier-config": "0.0.4",
"@koddsson/postcss-sass": "5.0.0",
"@primer/stylelint-config": "12.0.1",
"@primer/stylelint-config": "12.1.0",
"autoprefixer": "10.3.7",
"cssstats": "4.0.2",
"eslint": "7.32.0",
Expand Down
4 changes: 2 additions & 2 deletions src/alerts/index.scss
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
// support files
@import "../support/index.scss";
@import "./flash.scss";
@import '../support/index.scss';
@import './flash.scss';
6 changes: 3 additions & 3 deletions src/autocomplete/index.scss
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// support files
@import "../support/index.scss";
@import "./autocomplete.scss";
@import "./suggester.scss";
@import '../support/index.scss';
@import './autocomplete.scss';
@import './suggester.scss';
2 changes: 1 addition & 1 deletion src/autocomplete/suggester.scss
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
}
}

&[aria-selected="true"],
&[aria-selected='true'],
&.navigation-focus {
color: var(--color-fg-on-emphasis);
text-decoration: none;
Expand Down
2 changes: 1 addition & 1 deletion src/avatars/avatar-stack.scss
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@
position: absolute;
display: block;
height: 20px;
content: "";
content: '';
// stylelint-disable-next-line primer/borders
border-radius: 2px;
outline: $border-width $border-style var(--color-canvas-default);
Expand Down
2 changes: 1 addition & 1 deletion src/avatars/circle-badge.scss
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
top: 50%;
left: 0;
width: 100%;
content: "";
content: '';
// stylelint-disable-next-line primer/borders
border-bottom: 2px dashed var(--color-border-default);
}
Expand Down
10 changes: 5 additions & 5 deletions src/avatars/index.scss
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
@import "../support/index.scss";
@import '../support/index.scss';

// Avatars
@import "./avatar.scss";
@import "./avatar-parent-child.scss";
@import "./avatar-stack.scss";
@import "./circle-badge.scss";
@import './avatar.scss';
@import './avatar-parent-child.scss';
@import './avatar-stack.scss';
@import './circle-badge.scss';
12 changes: 6 additions & 6 deletions src/base/index.scss
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
@import "../support/index.scss";
@import '../support/index.scss';

@import "./normalize.scss";
@import "./base.scss";
@import "./kbd.scss";
@import "./typography-base.scss";
@import "./octicons.scss";
@import './normalize.scss';
@import './base.scss';
@import './kbd.scss';
@import './typography-base.scss';
@import './octicons.scss';
4 changes: 2 additions & 2 deletions src/blankslate/index.scss
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
@import "../support/index.scss";
@import '../support/index.scss';

@import "./blankslate.scss";
@import './blankslate.scss';
4 changes: 2 additions & 2 deletions src/box/index.scss
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
@import "../support/index.scss";
@import "./box.scss";
@import '../support/index.scss';
@import './box.scss';
4 changes: 2 additions & 2 deletions src/branch-name/index.scss
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
// support files
@import "../support/index.scss";
@import "./branch-name.scss";
@import '../support/index.scss';
@import './branch-name.scss';
4 changes: 2 additions & 2 deletions src/breadcrumb/index.scss
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
// support files
@import "../support/index.scss";
@import "./breadcrumb.scss";
@import '../support/index.scss';
@import './breadcrumb.scss';
8 changes: 4 additions & 4 deletions src/buttons/index.scss
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@import "../support/index.scss";
@import "./button.scss";
@import "./button-group.scss";
@import "./misc.scss";
@import '../support/index.scss';
@import './button.scss';
@import './button-group.scss';
@import './misc.scss';
14 changes: 7 additions & 7 deletions src/color-modes/index.scss
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
// All themes

@import "./themes/light.scss";
@import "./themes/light_colorblind.scss";
@import "./themes/dark.scss";
@import "./themes/dark_dimmed.scss";
@import "./themes/dark_high_contrast.scss";
@import "./themes/dark_colorblind.scss";
@import "./native.scss";
@import './themes/light.scss';
@import './themes/light_colorblind.scss';
@import './themes/dark.scss';
@import './themes/dark_dimmed.scss';
@import './themes/dark_high_contrast.scss';
@import './themes/dark_colorblind.scss';
@import './native.scss';
28 changes: 14 additions & 14 deletions src/core/index.scss
Original file line number Diff line number Diff line change
Expand Up @@ -6,23 +6,23 @@
*/

// Global requirements
@import "../support/index.scss";
@import '../support/index.scss';

// Color modes

// Core modules
@import "../base/index.scss";
@import "../box/index.scss";
@import "../breadcrumb/index.scss";
@import "../buttons/index.scss";
@import "../table-object/index.scss";
@import "../forms/index.scss";
@import "../layout/index.scss";
@import "../links/index.scss";
@import "../navigation/index.scss";
@import "../pagination/index.scss";
@import "../tooltips/index.scss";
@import "../truncate/index.scss";
@import '../base/index.scss';
@import '../box/index.scss';
@import '../breadcrumb/index.scss';
@import '../buttons/index.scss';
@import '../table-object/index.scss';
@import '../forms/index.scss';
@import '../layout/index.scss';
@import '../links/index.scss';
@import '../navigation/index.scss';
@import '../pagination/index.scss';
@import '../tooltips/index.scss';
@import '../truncate/index.scss';

// Utilities always go last so that they can override components
@import "../utilities/index.scss";
@import '../utilities/index.scss';
8 changes: 4 additions & 4 deletions src/dropdown/dropdown.scss
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
width: 0;
height: 0;
vertical-align: middle;
content: "";
content: '';
border-style: $border-style;
// stylelint-disable-next-line primer/borders
border-width: $spacer-1 $spacer-1 0;
Expand Down Expand Up @@ -40,7 +40,7 @@
&::after {
position: absolute;
display: inline-block;
content: "";
content: '';
}

// caret border
Expand Down Expand Up @@ -94,7 +94,7 @@
opacity: 1;
}

[class*="color-text-"] {
[class*='color-text-'] {
color: inherit !important;
}

Expand Down Expand Up @@ -130,7 +130,7 @@
color: var(--color-fg-muted);
}

.dropdown-item[aria-checked="false"] .octicon-check {
.dropdown-item[aria-checked='false'] .octicon-check {
display: none;
}

Expand Down
4 changes: 2 additions & 2 deletions src/dropdown/index.scss
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
@import "../support/index.scss";
@import "./dropdown.scss";
@import '../support/index.scss';
@import './dropdown.scss';
4 changes: 2 additions & 2 deletions src/forms/form-group.scss
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@
// stylelint-disable-next-line primer/spacing
padding-left: 5px;
color: var(--color-danger-fg);
content: "*";
content: '*';
}
}

Expand Down Expand Up @@ -169,7 +169,7 @@
width: 0;
height: 0;
pointer-events: none;
content: " ";
content: ' ';
// stylelint-disable-next-line primer/borders
border: $border-style transparent;
}
Expand Down
4 changes: 2 additions & 2 deletions src/forms/form-select.scss
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
padding-right: $spacer-4;
background-color: var(--color-canvas-default);
// SVG with fill: #586069 (--color-icon-secondary)
background-image: url("data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iMTYiIGhlaWdodD0iMTYiIHZpZXdCb3g9IjAgMCAxNiAxNiIgZmlsbD0iIzU4NjA2OSIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIj48cGF0aCBkPSJNNC40MjcgOS40MjdsMy4zOTYgMy4zOTZhLjI1MS4yNTEgMCAwMC4zNTQgMGwzLjM5Ni0zLjM5NkEuMjUuMjUgMCAwMDExLjM5NiA5SDQuNjA0YS4yNS4yNSAwIDAwLS4xNzcuNDI3ek00LjQyMyA2LjQ3TDcuODIgMy4wNzJhLjI1LjI1IDAgMDEuMzU0IDBMMTEuNTcgNi40N2EuMjUuMjUgMCAwMS0uMTc3LjQyN0g0LjZhLjI1LjI1IDAgMDEtLjE3Ny0uNDI3eiIgLz48L3N2Zz4=");
background-image: url('data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iMTYiIGhlaWdodD0iMTYiIHZpZXdCb3g9IjAgMCAxNiAxNiIgZmlsbD0iIzU4NjA2OSIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIj48cGF0aCBkPSJNNC40MjcgOS40MjdsMy4zOTYgMy4zOTZhLjI1MS4yNTEgMCAwMC4zNTQgMGwzLjM5Ni0zLjM5NkEuMjUuMjUgMCAwMDExLjM5NiA5SDQuNjA0YS4yNS4yNSAwIDAwLS4xNzcuNDI3ek00LjQyMyA2LjQ3TDcuODIgMy4wNzJhLjI1LjI1IDAgMDEuMzU0IDBMMTEuNTcgNi40N2EuMjUuMjUgMCAwMS0uMTc3LjQyN0g0LjZhLjI1LjI1IDAgMDEtLjE3Ny0uNDI3eiIgLz48L3N2Zz4=');
background-repeat: no-repeat;
background-position: right 4px center;
background-size: 16px;
Expand All @@ -27,7 +27,7 @@
@include color-mode(dark) {
.form-select {
// SVG with fill: #6e7681 (--color-icon-secondary)
background-image: url("data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iMTYiIGhlaWdodD0iMTYiIHZpZXdCb3g9IjAgMCAxNiAxNiIgZmlsbD0iIzZlNzY4MSIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIj48cGF0aCBkPSJNNC40MjcgOS40MjdsMy4zOTYgMy4zOTZhLjI1MS4yNTEgMCAwMC4zNTQgMGwzLjM5Ni0zLjM5NkEuMjUuMjUgMCAwMDExLjM5NiA5SDQuNjA0YS4yNS4yNSAwIDAwLS4xNzcuNDI3ek00LjQyMyA2LjQ3TDcuODIgMy4wNzJhLjI1LjI1IDAgMDEuMzU0IDBMMTEuNTcgNi40N2EuMjUuMjUgMCAwMS0uMTc3LjQyN0g0LjZhLjI1LjI1IDAgMDEtLjE3Ny0uNDI3eiIgLz48L3N2Zz4=");
background-image: url('data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iMTYiIGhlaWdodD0iMTYiIHZpZXdCb3g9IjAgMCAxNiAxNiIgZmlsbD0iIzZlNzY4MSIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIj48cGF0aCBkPSJNNC40MjcgOS40MjdsMy4zOTYgMy4zOTZhLjI1MS4yNTEgMCAwMC4zNTQgMGwzLjM5Ni0zLjM5NkEuMjUuMjUgMCAwMDExLjM5NiA5SDQuNjA0YS4yNS4yNSAwIDAwLS4xNzcuNDI3ek00LjQyMyA2LjQ3TDcuODIgMy4wNzJhLjI1LjI1IDAgMDEuMzU0IDBMMTEuNTcgNi40N2EuMjUuMjUgMCAwMS0uMTc3LjQyN0g0LjZhLjI1LjI1IDAgMDEtLjE3Ny0uNDI3eiIgLz48L3N2Zz4=');
}
}

Expand Down
18 changes: 9 additions & 9 deletions src/forms/form-validation.scss
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,15 @@ dl.form-group > dd, // TODO: Deprecate
}

&.is-autocheck-loading {
background-image: url("/images/spinners/octocat-spinner-16px.gif");
background-image: url('/images/spinners/octocat-spinner-16px.gif');
}

&.is-autocheck-successful {
background-image: url("/images/modules/ajax/success.png");
background-image: url('/images/modules/ajax/success.png');
}

&.is-autocheck-errored {
background-image: url("/images/modules/ajax/error.png");
background-image: url('/images/modules/ajax/error.png');
}
}
}
Expand All @@ -36,15 +36,15 @@ dl.form-group > dd, // TODO: Deprecate
}

&.is-autocheck-loading {
background-image: url("/images/spinners/octocat-spinner-32.gif");
background-image: url('/images/spinners/octocat-spinner-32.gif');
}

&.is-autocheck-successful {
background-image: url("/images/modules/ajax/success@2x.png");
background-image: url('/images/modules/ajax/success@2x.png');
}

&.is-autocheck-errored {
background-image: url("/images/modules/ajax/error@2x.png");
background-image: url('/images/modules/ajax/error@2x.png');
}
}
}
Expand All @@ -67,7 +67,7 @@ dl.form-group > dd, // TODO: Deprecate
.status-indicator-success {
// Override primer
&::before {
content: "";
content: '';
}

.octicon-check {
Expand All @@ -84,7 +84,7 @@ dl.form-group > dd, // TODO: Deprecate
.status-indicator-failed {
// Override primer
&::before {
content: "";
content: '';
}

.octicon-check {
Expand All @@ -100,7 +100,7 @@ dl.form-group > dd, // TODO: Deprecate

.status-indicator-loading {
width: 16px;
background-image: url("/images/spinners/octocat-spinner-32-EAF2F5.gif");
background-image: url('/images/spinners/octocat-spinner-32-EAF2F5.gif');
background-repeat: no-repeat;
background-position: 0 0;
background-size: 16px;
Expand Down
14 changes: 7 additions & 7 deletions src/forms/index.scss
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
@import "../support/index.scss";
@import "./form-control.scss";
@import "./form-select.scss";
@import "./form-group.scss";
@import "./form-validation.scss";
@import "./input-group.scss";
@import "./radio-group.scss";
@import '../support/index.scss';
@import './form-control.scss';
@import './form-select.scss';
@import './form-group.scss';
@import './form-validation.scss';
@import './input-group.scss';
@import './radio-group.scss';
4 changes: 2 additions & 2 deletions src/header/index.scss
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
@import "../support/index.scss";
@import "./header.scss";
@import '../support/index.scss';
@import './header.scss';
14 changes: 7 additions & 7 deletions src/labels/index.scss
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
@import "../support/index.scss";
@import "./mixins.scss";
@import '../support/index.scss';
@import './mixins.scss';

@import "./issue-labels.scss";
@import "./labels.scss";
@import "./states.scss";
@import "./counters.scss";
@import "./diffstat.scss";
@import './issue-labels.scss';
@import './labels.scss';
@import './states.scss';
@import './counters.scss';
@import './diffstat.scss';
2 changes: 1 addition & 1 deletion src/layout/grid.scss
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
margin-right: -$gutter-width;
margin-left: -$gutter-width;

> [class*="col-"] {
> [class*='col-'] {
padding-right: $gutter-width !important;
padding-left: $gutter-width !important;
}
Expand Down
12 changes: 6 additions & 6 deletions src/layout/index.scss
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
@import "../support/index.scss";
@import "./mixins.scss";
@import '../support/index.scss';
@import './mixins.scss';

@import "./container.scss";
@import "./grid.scss";
@import "./grid-offset.scss";
@import "./layout.scss";
@import './container.scss';
@import './grid.scss';
@import './grid-offset.scss';
@import './layout.scss';
2 changes: 1 addition & 1 deletion src/layout/layout.scss
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

.Layout {
display: grid;
--Layout-sidebar-width: #{map-get($sidebar-width, "sm")};
--Layout-sidebar-width: #{map-get($sidebar-width, 'sm')};
--Layout-gutter: 16px;

@media (max-width: calc(#{$width-sm} - 1px)) {
Expand Down
4 changes: 2 additions & 2 deletions src/links/index.scss
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
// support files
@import "../support/index.scss";
@import "./link.scss";
@import '../support/index.scss';
@import './link.scss';
2 changes: 1 addition & 1 deletion src/links/link.scss
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
.Link--secondary,
.Link--primary,
.Link--muted {
&:hover [class*="color-text"] {
&:hover [class*='color-text'] {
color: inherit !important;
}
}
4 changes: 2 additions & 2 deletions src/loaders/index.scss
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
@import "../support/index.scss";
@import "./loaders.scss";
@import '../support/index.scss';
@import './loaders.scss';
Loading

0 comments on commit bb98f73

Please sign in to comment.