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

Merged
merged 1 commit into from
Jun 12, 2024
Merged

MNT Fix scss lint warnings #538

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: 1 addition & 1 deletion client/dist/styles/advancedworkflow.css
View file
Open in desktop

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

1 change: 0 additions & 1 deletion client/src/styles/AdvancedWorkflowAdmin.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
}

// Embargo & expiry badge styling
//
// 3 different statuses - embargo, expiry, embargo & expiry (both assigned)
// Note: CSS nesting convention based on SilverStripe admin styling
.cms-tree.jstree {
Expand Down
16 changes: 3 additions & 13 deletions client/src/styles/WorkflowField.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,21 +41,14 @@

.workflow-field-action-disabled {
opacity: 0.35;
filter: Alpha(Opacity=35);
filter: alpha(Opacity=35);
cursor: default;

// These default styles are taken from .ss-ui-button (_forms.scss) so we don't end up with mousover/focus states on disabled buttons.
// @todo These styles need to be dynamcally included from CMS, they are obviousely "hard-coded" for now.
&.ui-state-hover,
&.ui-state-focus {
text-decoration: none;
background-color: #e6e6e6;
background: url("data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJ1c2VyU3BhY2VPblVzZSIgeDE9IjUwJSIgeTE9IjAlIiB4Mj0iNTAlIiB5Mj0iMTAwJSI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iI2ZmZmZmZiIvPjxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iI2Q5ZDlkOSIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JhZCkiIC8+PC9zdmc+IA==");
background: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, $white), color-stop(100%, $grey-lightish));
background: -webkit-linear-gradient($white, $grey-lightish);
background: -moz-linear-gradient($white, $grey-lightish);
background: -o-linear-gradient($white, $grey-lightish);
background: -ms-linear-gradient($white, $grey-lightish);
background: linear-gradient($white, $grey-lightish);
Copy link
Collaborator Author

@GuySartorelli GuySartorelli Jun 10, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

linear-gradient is supported for all browsers we care about. Everything else here was old fallbacks. That svg is just the gradient as an SVG.

text-shadow: $white 0 1px 1px;
-webkit-box-shadow: none;
Expand Down Expand Up @@ -89,7 +82,7 @@
.workflow-field-action-icon {
width: 16px;
height: 16px;
margin: calc($wf-height / 4) $wf-grid 0 $wf-grid;
margin: calc($wf-height / 4) $wf-grid 0;
}

h4 {
Expand Down Expand Up @@ -150,12 +143,9 @@
.workflow-field-loading {
background: rgba(0, 0, 0, .15) url("../images/spinner.gif") no-repeat center center;
border-radius: 0 0 $wf-radius $wf-radius;
bottom: 0;
inset: 0;
display: none;
left: 0;
position: absolute;
right: 0;
top: 0;
z-index: 999;
}
}
Expand Down
2 changes: 1 addition & 1 deletion client/src/styles/WorkflowGridField.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
.disabled {
a.action {
opacity: 0.35;
filter: Alpha(Opacity=35);
filter: alpha(Opacity=35);
cursor: default;
}
}
Expand Down
2 changes: 0 additions & 2 deletions client/src/styles/bundle.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
// See includePaths in webpack.config.js
@import "variables";

@import "workflow-variables";

@import "AdvancedWorkflowAdmin";
@import "WorkflowField";
@import "WorkflowGridField";
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 @@ -6,7 +6,7 @@
"dev": "NODE_ENV=development webpack --progress",
"watch": "yarn && NODE_ENV=development webpack --watch --progress",
"css": "WEBPACK_CHILD=css npm run build",
"lint": "eslint client/src; stylelint client/src/**/*.scss"
"lint": "eslint client/src; stylelint client/src"
},
"repository": {
"type": "git",
Expand All @@ -25,7 +25,7 @@
"homepage": "https://github.com/symbiote/silverstripe-advancedworkflow#readme",
"dependencies": {},
"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
8 changes: 4 additions & 4 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1354,10 +1354,10 @@
resolved "https://registry.yarnpkg.com/@sect/modernizr-loader/-/modernizr-loader-1.0.5.tgz#512afc60c715cd658fdffab244123661e1339083"
integrity sha512-L8y2BTVeLtdSe1XzBcD2DOlc+7fR7Z/uNdhsKvf3d3x3gmEKz9sfl2wJ3VzFhEd+a/O6qgacuhbziphG2p4s8g==

"@silverstripe/eslint-config@^1.2.1":
version "1.2.1"
resolved "https://registry.yarnpkg.com/@silverstripe/eslint-config/-/eslint-config-1.2.1.tgz#17ed5e955308a4a89e87f5090df66ca1e8ea462d"
integrity sha512-T4Lz1aZEDLxRpSNe4EgEmLKPfofxba0p0+YkL/AOD8VM/sng7VM9vKwMoqICbsUGvNoymHfeWtARlCa575O4PA==
"@silverstripe/eslint-config@^1.3.0":
version "1.3.0"
resolved "https://registry.yarnpkg.com/@silverstripe/eslint-config/-/eslint-config-1.3.0.tgz#fa88f47cacd6103f6b759d81e1d86f9e93799413"
integrity sha512-Q3+sQKO1ysyMLhJ91kOl2LqJhQICfHFeqMx09EH0xx3dRHgjsQvqHIzVWEzPkM/l7D79m+Ma/WBnon30S7TVlA==
dependencies:
eslint "^8.26.0"
eslint-config-airbnb "^19.0.4"
Expand Down
Loading