Merge branch '5' into 6.2

client/src/styles/AdvancedWorkflowAdmin.scss

@@ -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 {

client/src/styles/WorkflowField.scss

@@ -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);
           text-shadow: $white 0 1px 1px;
           -webkit-box-shadow: none;
@@ -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 {
@@ -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;
   }
 }

client/src/styles/WorkflowGridField.scss

@@ -3,7 +3,7 @@
     .disabled {
       a.action {
         opacity: 0.35;
-        filter: Alpha(Opacity=35);
+        filter: alpha(Opacity=35);
         cursor: default;
       }
     }

client/src/styles/bundle.scss

@@ -1,8 +1,6 @@
 // See includePaths in webpack.config.js
 @import "variables";
-
 @import "workflow-variables";
-
 @import "AdvancedWorkflowAdmin";
 @import "WorkflowField";
 @import "WorkflowGridField";

package.json

@@ -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",
@@ -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"