Skip to content

Commit

Permalink
chore(lint): re-add stylelint-order (#8940)
Browse files Browse the repository at this point in the history
this was removed in ec6822f due to
updating stylelint-config-sass-guidelines

re-adding per bjankord/stylelint-config-sass-guidelines#278

run stylelint --fix
  • Loading branch information
LeoMcA committed May 26, 2023
1 parent a01c650 commit 3f09a66
Show file tree
Hide file tree
Showing 5 changed files with 48 additions and 11 deletions.
25 changes: 24 additions & 1 deletion .stylelintrc.json
Expand Up @@ -6,7 +6,7 @@
"stylelint-prettier/recommended",
"stylelint-config-prettier"
],
"plugins": ["stylelint-scss"],
"plugins": ["stylelint-scss", "stylelint-order"],
"rules": {
"a11y/media-prefers-reduced-motion": null,
"a11y/no-outline-none": null,
Expand All @@ -18,6 +18,29 @@
"no-descending-specificity": null,
"no-invalid-position-at-import-rule": null,
"no-irregular-whitespace": null,
"order/order": [
[
"custom-properties",
"dollar-variables",
{
"type": "at-rule",
"name": "extend"
},
{
"type": "at-rule",
"name": "include",
"hasBlock": false
},
"declarations",
{
"type": "at-rule",
"name": "include",
"hasBlock": true
},
"rules"
]
],
"order/properties-alphabetical-order": true,
"property-no-vendor-prefix": null,
"selector-class-pattern": null,
"selector-max-compound-selectors": null,
Expand Down
2 changes: 1 addition & 1 deletion client/src/newsletter/index.scss
@@ -1,6 +1,6 @@
.main-newsletter {
max-width: 35rem;
margin: 0 auto;
max-width: 35rem;
padding: 2rem;

input[type="email"],
Expand Down
18 changes: 9 additions & 9 deletions client/src/ui/organisms/placement/index.scss
Expand Up @@ -64,14 +64,14 @@ section.place {
}

&.top {
align-items: center;
display: grid;
font-size: 0.625rem;

grid-template-areas: "pong cta" "no note";
height: var(--top-banner-height);
margin: 0 auto;
width: 100%;
align-items: center;

@media screen and (min-width: $screen-md) {
grid-template-areas: "pong cta note" "pong cta no";
Expand Down Expand Up @@ -110,21 +110,21 @@ section.place {
color: var(--place-top-cta-color);
font-size: var(--type-smaller-font-size);
grid-area: cta;
padding: 0.25rem 1rem;
text-align: center;
height: fit-content;
margin-right: auto;
padding: 0.25rem 1rem;
text-align: center;
}

.pong-note {
grid-area: note;
background-color: var(--text-primary);
border: 1px solid var(--border-primary);
border-radius: 0 0 0.5rem 0.5rem;
border-top: none;
padding: 0 0.5rem 0.125rem;
margin: 0 0 auto auto;
color: var(--background-secondary);
background-color: var(--text-primary);
border-radius: 0 0 0.5rem 0.5rem;
grid-area: note;
margin: 0 0 auto auto;
padding: 0 0.5rem 0.125rem;
text-decoration: none;

&:hover,
Expand All @@ -136,8 +136,8 @@ section.place {
}

.no-pong {
grid-area: no;
color: var(--place-top-color);
grid-area: no;
margin: auto 0 0 2rem;
width: initial;
}
Expand Down
1 change: 1 addition & 0 deletions package.json
Expand Up @@ -228,6 +228,7 @@
"stylelint-config-prettier": "^9.0.5",
"stylelint-config-recommended": "^12.0.0",
"stylelint-config-sass-guidelines": "^10.0.0",
"stylelint-order": "^6.0.3",
"stylelint-prettier": "^3.0.0",
"stylelint-scss": "^5.0.0",
"swr": "^2.1.5",
Expand Down
13 changes: 13 additions & 0 deletions yarn.lock
Expand Up @@ -10943,6 +10943,11 @@ postcss-selector-parser@^6.0.10, postcss-selector-parser@^6.0.11, postcss-select
cssesc "^3.0.0"
util-deprecate "^1.0.2"

postcss-sorting@^8.0.2:
version "8.0.2"
resolved "https://registry.yarnpkg.com/postcss-sorting/-/postcss-sorting-8.0.2.tgz#6393385ece272baf74bee9820fb1b58098e4eeca"
integrity sha512-M9dkSrmU00t/jK7rF6BZSZauA5MAaBW4i5EnJXspMwt4iqTh/L9j6fgMnbElEOfyRyfLfVbIHj/R52zHzAPe1Q==

postcss-svgo@^6.0.0:
version "6.0.0"
resolved "https://registry.yarnpkg.com/postcss-svgo/-/postcss-svgo-6.0.0.tgz#7b18742d38d4505a0455bbe70d52b49f00eaf69d"
Expand Down Expand Up @@ -12699,6 +12704,14 @@ stylelint-config-sass-guidelines@^10.0.0:
postcss-scss "^4.0.6"
stylelint-scss "^4.4.0"

stylelint-order@^6.0.3:
version "6.0.3"
resolved "https://registry.yarnpkg.com/stylelint-order/-/stylelint-order-6.0.3.tgz#160b78650bd90463241b992581efee7159baefc2"
integrity sha512-1j1lOb4EU/6w49qZeT2SQVJXm0Ht+Qnq9GMfUa3pMwoyojIWfuA+JUDmoR97Bht1RLn4ei0xtLGy87M7d29B1w==
dependencies:
postcss "^8.4.21"
postcss-sorting "^8.0.2"

stylelint-prettier@^3.0.0:
version "3.0.0"
resolved "https://registry.yarnpkg.com/stylelint-prettier/-/stylelint-prettier-3.0.0.tgz#57028b99866ed4c3ae045ddd891bf9a77d274726"
Expand Down

0 comments on commit 3f09a66

Please sign in to comment.