FIX CSS and JS warnings

symbiote · Mar 21, 2023 · a9f1f6c · a9f1f6c
1 parent 6e2c3a9
commit a9f1f6c
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 17 deletions.
diff --git a/client/dist/styles/advancedworkflow.css b/client/dist/styles/advancedworkflow.css
diff --git a/client/src/bundles/WorkflowField.js b/client/src/bundles/WorkflowField.js
@@ -145,6 +145,7 @@ jQuery.entwine('workflow', ($) => {
 
   $('.workflow-field .workflow-field-delete').entwine({
     onclick() {
+      // eslint-disable-next-line no-alert
       if (confirm(i18n._t('Workflow.DeleteQuestion'))) {
         const data = {
           SecurityID: this.data('securityid'),

diff --git a/client/src/bundles/advancedworkflow-management.js b/client/src/bundles/advancedworkflow-management.js
@@ -7,11 +7,13 @@ jQuery.entwine('ss', ($) => {
       e.preventDefault();
 
       // get the stuff for it and show a dialog
+      // eslint-disable-next-line no-alert
       const comments = prompt('Comments');
       const instanceId = this.parents('ul').attr('data-instance-id');
       const transitionId = this.attr('data-transition-id');
       const securityId = $('[name=SecurityID]').val();
       if (!securityId) {
+        // eslint-disable-next-line no-alert
         alert('Invalid SecurityID field!');
         return false;
       }
@@ -31,6 +33,7 @@ jQuery.entwine('ss', ($) => {
             if (parsedData.success) {
               location.href = parsedData.link;
             } else {
+              // eslint-disable-next-line no-alert
               alert(i18n._t('Workflow.ProcessError'));
             }
           }

diff --git a/client/src/styles/AdvancedWorkflowAdmin.scss b/client/src/styles/AdvancedWorkflowAdmin.scss
@@ -15,11 +15,11 @@
 .cms-tree.jstree {
   span.badge.status-embargo,
   span.badge.status-expiry,
-  span.badge.status-embargo_expiry {
+  span.badge.status-embargo_expiry {// sass-lint:disable-line class-name-format
     background-color: $grey-light;
     color: $brand-success;
 
-    #cms-content-tools-CMSMain & {
+    #cms-content-tools-CMSMain & {// sass-lint:disable-line no-ids
       -webkit-box-shadow: 0 0 6px 2px $grey-light;
       box-shadow: 0 0 6px 2px $grey-light;
     }

diff --git a/client/src/styles/WorkflowField.scss b/client/src/styles/WorkflowField.scss
@@ -17,12 +17,12 @@
     }
 
     .workflow-field-do-create {
-      margin-left: $wf-grid / 2;
+      margin-left: calc($wf-grid / 2);
     }
   }
 
   .workflow-field-create {
-    padding: $wf-grid/2 $wf-grid;
+    padding: calc($wf-grid / 2) $wf-grid;
   }
 
   .workflow-field-actions {
@@ -33,7 +33,7 @@
     padding: $wf-grid;
 
     .workflow-field-action {
-      margin-bottom: $wf-grid/2;
+      margin-bottom: calc($wf-grid / 2);
 
       &:last-child {
         margin-bottom: 0;
@@ -57,8 +57,6 @@
           background: -o-linear-gradient($white, $grey-lightish);
           background: -ms-linear-gradient($white, $grey-lightish);
           background: linear-gradient($white, $grey-lightish);
-          -webkit-text-shadow: $white 0 1px 1px;
-          -moz-text-shadow: $white 0 1px 1px;
           text-shadow: $white 0 1px 1px;
           -webkit-box-shadow: none;
           -moz-box-shadow: none;
@@ -72,7 +70,7 @@
       border: 1px solid $med-blue;
       border-left: 0;
       overflow: auto;
-      padding: $wf-grid/4 $wf-grid $wf-grid/4 0;
+      padding: calc($wf-grid / 4) $wf-grid calc($wf-grid / 4) 0;
 
       .workflow-field-action-icon,
       .workflow-field-action-drag {
@@ -83,20 +81,20 @@
       .workflow-field-action-drag {
         background: $med-blue;
         cursor: move;
-        margin: -$wf-grid/4 0;
+        margin: -(calc($wf-grid / 4)) 0;
         width: 4px;
-        height: $wf-height + $wf-grid/2 + 4;
+        height: $wf-height + calc($wf-grid / 2) + 4;
       }
 
       .workflow-field-action-icon {
         width: 16px;
         height: 16px;
-        margin: $wf-height/4 $wf-grid 0 $wf-grid;
+        margin: calc($wf-height / 4) $wf-grid 0 $wf-grid;
       }
 
       h4 {
         float: left;
-        margin: $wf-height/4 $wf-grid 0 0;
+        margin: calc($wf-height / 4) $wf-grid 0 0;
         min-width: $wf-min-width;
         text-shadow: 0 1px 0 rgba(255, 255, 255, 0.4);
       }
@@ -111,13 +109,13 @@
         border-left: 0;
         border-top: 0;
         overflow: auto;
-        padding: $wf-grid/2 $wf-grid/2 $wf-grid/2 0;
+        padding: calc($wf-grid / 2) calc($wf-grid / 2) calc($wf-grid / 2) 0;
 
         .workflow-field-action-drag {
           background: $light-blue;
           cursor: move;
           float: left;
-          margin: -$wf-grid/2 0;
+          margin: -(calc($wf-grid / 2)) 0;
           width: 4px;
           height: 41px;
         }
@@ -145,8 +143,8 @@
   }
 
   .workflow-placeholder {
-    margin-bottom: $wf-grid / 2;
-    height: $wf-grid * 4;
+    margin-bottom: calc($wf-grid / 2);
+    height: calc($wf-grid * 4);
   }
 
   .workflow-field-loading {