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.

Sign up for GitHub

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 Fix scss lint warnings #239

Merged
merged 1 commit into from
Jun 11, 2024
Merged

MNT Fix scss lint warnings #239

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 0 additions & 2 deletions .stylelintignore
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion client/dist/styles/bundle-cms.css
View file
Open in desktop

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

2 changes: 1 addition & 1 deletion client/dist/styles/bundle-frontend.css
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion client/src/components/ShareDraftContent/ShareDraftContent.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
}

// Add the external link icon after the "learn more" link
.share-draft-content__learn-more::after {
.share-draft-content__learn-more:after {
font-family: 'silverstripe';
// font-icon-external-link
content: '@';
Expand Down
1 change: 0 additions & 1 deletion client/src/styles/bundle-cms.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
// Core variables
@import "variables";

@import "../components/ShareDraftContent/ShareDraftContent";
4 changes: 2 additions & 2 deletions client/src/styles/error-page.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@import 'mixins.scss';
@import 'mixins';

html {
height: 100%;
Expand All @@ -8,7 +8,7 @@ html {
position: relative;
height: 100%;
margin: 0;
font-family: "HelveticaNeue-Light", "Helvetica Neue Light", "Helvetica Neue", Helvetica, Arial, "Lucida Grande", sans-serif;
font-family: "HelveticaNeue-Light", "Helvetica Neue Light", "Helvetica Neue", "Helvetica", "Arial", "Lucida Grande", sans-serif;
font-weight: 300;
background: #eaf1f4;

Expand Down
8 changes: 4 additions & 4 deletions client/src/styles/mixins.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,23 +1,23 @@
@mixin mobile-screen {
@media (max-width: 768px) and (max-height: 540px) {
@media (width <= 768px) and (height <= 540px) {
@content;
}
}

@mixin small-screen {
@media (max-width: 768px) {
@media (width <= 768px) {
@content;
}
}

@mixin large-screen {
@media (min-width: 1441px) {
@media (width >= 1441px) {
@content;
}
}

@mixin topbar-small {
@media (max-width: 582px) {
@media (width <= 582px) {
@content;
}
}
4 changes: 2 additions & 2 deletions client/src/styles/top-bar.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@import 'mixins.scss';
@import 'mixins';

body {
margin-top: 39px !important;
Expand Down Expand Up @@ -68,7 +68,7 @@ body {
text-align: center;
margin-top: 0;
margin-bottom: 0;
font-family: Arial, Helvetica, sans-serif;
font-family: "Arial", "Helvetica", sans-serif;
font-size: 13px;
line-height: 16px;
color: rgb(51, 51, 51);
Expand Down
6 changes: 3 additions & 3 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@
"dev": "NODE_ENV=development webpack --progress",
"watch": "NODE_ENV=development webpack --watch --progress",
"css": "WEBPACK_CHILD=css npm run build",
"lint": "eslint client/src && yarn lint-sass",
"lint": "yarn lint-js && yarn lint-sass",
"lint-js": "eslint client/src",
"lint-js-fix": "eslint client/src --fix",
"lint-sass": "stylelint **/client/src/**/*.scss",
"lint-sass": "stylelint client/src",
"test": "echo 1 > /dev/null"
},
"dependencies": {
Expand All @@ -33,7 +33,7 @@
"react-dom": "18.2.0"
},
"devDependencies": {
"@silverstripe/eslint-config": "^1.2.1",
"@silverstripe/eslint-config": "^1.3.0",
"@silverstripe/webpack-config": "^2.1.0",
"webpack": "^5.74.0",
"webpack-cli": "^5.0.0"
Expand Down
Loading
Loading