Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

MNT Replace sass-lint with stylelint #862

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
179 changes: 0 additions & 179 deletions .sass-lint.yml

This file was deleted.

1 change: 1 addition & 0 deletions .stylelintrc.js
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
module.exports = require('@silverstripe/eslint-config/.stylelintrc');
2 changes: 1 addition & 1 deletion client/dist/styles/fluent.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions client/src/styles/fluent.scss
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ $fluent-color-localised: rgb(102, 15, 242);
position: relative;

&:before {
color: white;
color: #fff;
position: absolute;
top: 50%;
line-height: 0;
Expand All @@ -72,7 +72,7 @@ $fluent-color-localised: rgb(102, 15, 242);
background-size: 12px;
border-radius: 5px;
border: 0 none;
color: white;
color: #fff;
padding: 5px 21px 5px 24px;
width: 100%;

Expand All @@ -82,7 +82,7 @@ $fluent-color-localised: rgb(102, 15, 242);
padding: 2px;

> option {
color: white;
color: #fff;
}
}
}
Expand Down Expand Up @@ -146,7 +146,7 @@ $fluent-color-localised: rgb(102, 15, 242);
line-height: 1em;
display: block !important;// sass-lint:disable-line no-important
margin: 0;
padding: 0 11px 8px 11px;
padding: 0 11px 8px;
border-bottom: 1px solid #ccc;
color: #999;

Expand Down
6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"dev": "NODE_ENV=development webpack --progress",
"watch": "NODE_ENV=development webpack --watch --progress",
"css": "WEBPACK_CHILD=css npm run build",
"lint": "eslint client/src && sass-lint -v"
"lint": "eslint client/src && stylelint client/src"
},
"repository": {
"type": "git",
Expand All @@ -27,8 +27,8 @@
},
"homepage": "https://github.com/tractorcow-farm/silverstripe-fluent",
"devDependencies": {
"@silverstripe/eslint-config": "^1.0.0-alpha6",
"@silverstripe/webpack-config": "^2.0.0-alpha6",
"@silverstripe/eslint-config": "^1.3.0",
"@silverstripe/webpack-config": "^2.0.0",
"webpack": "^5.74.0",
"webpack-cli": "^5.0.0"
},
Expand Down
Loading
Loading