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 #296

Merged
merged 1 commit into from
Jun 11, 2024
Merged

MNT Fix scss lint warnings #296

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
1 change: 1 addition & 0 deletions .stylelintrc.js
View file
Open in desktop
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/bundle.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/src/components/LinkField/LinkField.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
right: 0;

&:focus,
&:not(:disabled):not(.disabled):active {
&:not(:disabled, .disabled):active {
box-shadow: none;
}
}
35 changes: 17 additions & 18 deletions client/src/components/LinkPicker/LinkPicker.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
height: auto;
width: 100%;
min-height: 54px;
background: white;
background: #fff;
padding: 0;
}

Expand All @@ -19,7 +19,7 @@
margin-bottom: 10px;
}

&.font-icon-link::before {
&.font-icon-link:before {
margin: $spacer-xs;
}
}
Expand All @@ -39,7 +39,7 @@
height: 100%;
text-align: left;

&::before {
&:before {
padding: $spacer-xs;
}
}
Expand All @@ -60,19 +60,16 @@
justify-content: space-between;
position: relative;
border-top: 0;
border-top-left-radius: 0;
border-top-right-radius: 0;
border-radius: 0;
border-bottom: 0;
border-bottom-left-radius: 0;
border-bottom-right-radius: 0;

&:hover, &:focus {
text-decoration: none;
color: inherit;
}

// version-state icon
&::before {
&:before {
top: 29px;
left: 32px;
content: ' ';
Expand All @@ -87,17 +84,17 @@
z-index: 1;
}

&--draft::before {
&--draft:before {
background-color: $state-draft-bg;
}

&--modified::before {
&--modified:before {
background-color: $state-modified-bg;
}

&--unsaved::before,
&--unversioned::before,
&--published::before {
&--unsaved:before,
&--unversioned:before,
&--published:before {
display: none;
}

Expand Down Expand Up @@ -128,10 +125,10 @@
height: 100%;
min-width: 0;
text-align: left;
border: none;
border: 0;
margin-right: 0;

&[class*="font-icon-"]::before {
&[class*="font-icon-"]:before {
position: absolute;
font-size: 1.231rem;
padding: .76925rem;
Expand All @@ -151,17 +148,17 @@
}

.font-icon-drag-handle {
opacity: 0%;
opacity: 0;
}

&:focus .font-icon-drag-handle {
opacity: 100%;
opacity: 1;
}
}

.link-picker__link:hover {
.link-picker__drag-handle .font-icon-drag-handle {
opacity: 100%;
opacity: 1;
}
}

Expand Down Expand Up @@ -206,10 +203,12 @@
.link-picker__title-text {
min-width: 0;
margin-right: 5px;

@extend %cutoff-text;
}

.link-picker__type {
width: 100%;

@extend %cutoff-text;
}
1 change: 0 additions & 1 deletion client/src/styles/bundle.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,5 @@
@import "~bootstrap/scss/mixins";
@import "~bootstrap/scss/functions";
@import "~bootstrap/scss/variables";

@import "../components/LinkField/LinkField";
@import "../components/LinkPicker/LinkPicker";
4 changes: 2 additions & 2 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
"lint": "yarn lint-js && yarn lint-sass",
"lint-js": "eslint client/src",
"lint-js-fix": "eslint client/src --fix",
"lint-sass": "sass-lint client/src"
"lint-sass": "stylelint client/src"
},
"jest": {
"testEnvironment": "jsdom",
Expand All @@ -48,7 +48,7 @@
},
"devDependencies": {
"@babel/runtime": "^7.20.0",
"@silverstripe/eslint-config": "^1.0.0",
"@silverstripe/eslint-config": "^1.3.0",
"@silverstripe/webpack-config": "^2.0.0",
"@testing-library/jest-dom": "^6.4.2",
"@testing-library/react": "^14.0.0",
Expand Down
Loading
Loading