MNT Fix scss lint warnings (#1202)

silverstripe · Jun 12, 2024 · f9b8249 · f9b8249
1 parent 0093776
commit f9b8249
Show file tree

Hide file tree

Showing 12 changed files with 458 additions and 834 deletions.
diff --git a/.stylelintignore b/.stylelintignore
diff --git a/client/dist/styles/bundle.css b/client/dist/styles/bundle.css
diff --git a/client/src/components/ElementEditor/ActionMenu.scss b/client/src/components/ElementEditor/ActionMenu.scss
@@ -1,6 +1,5 @@
 .element-editor .action-menu {
-
-    & .dropdown-item.disabled {
+    .dropdown-item.disabled {
       font-style: italic;
       pointer-events: initial;
       cursor: not-allowed;

diff --git a/client/src/components/ElementEditor/DragPositionIndicator.scss b/client/src/components/ElementEditor/DragPositionIndicator.scss
@@ -1,6 +1,6 @@
 .elemental-editor-drag-indicator {
   height: 3px;
-  margin: -2px 0 -1px 0;
+  margin: -2px 0 -1px;
   background-color: $info;
 
   &__ball {

diff --git a/client/src/components/ElementEditor/Element.scss b/client/src/components/ElementEditor/Element.scss
@@ -24,6 +24,5 @@
   &--dragging {
     opacity: 0.3;
     cursor: grabbing;
-    cursor: -webkit-grabbing;
   }
 }
diff --git a/client/src/components/ElementEditor/Header.scss b/client/src/components/ElementEditor/Header.scss
@@ -90,7 +90,6 @@
     position: absolute;
     left: 5px;
     cursor: grab;
-    cursor: -webkit-grab;
   }
 
   &--simple &__drag-handle {

diff --git a/client/src/components/ElementEditor/HoverBar.scss b/client/src/components/ElementEditor/HoverBar.scss
@@ -16,7 +16,7 @@ $transition: all ease .2s;
     width: 100%;
     margin: 0;
     padding: 0;
-    border: none;
+    border: 0;
     outline: none;
     transition: $transition;
     position: relative;
@@ -40,7 +40,7 @@ $transition: all ease .2s;
   }
 
   &__hover-bar-area-inner {
-    margin: 0 0;
+    margin: 0;
     display: block;
     position: relative;
     transition: $transition;
@@ -73,7 +73,6 @@ $transition: all ease .2s;
       display: block;
       height: 1em;
       // IE-11 fallback
-      transform: translateY(-35%);
       transform: translateY(calc(-1px + -50%)) scale(0);
       transition: $transition;
       color: $blue;

diff --git a/client/src/components/ElementEditor/InlineEditForm.scss b/client/src/components/ElementEditor/InlineEditForm.scss
@@ -20,7 +20,7 @@
   // Designs mandate that we're going with a "stacked" style here which doesn't currently
   // translate very well to higher width
   & &__form {
-    & .form-group .form__field-holder {
+    .form-group .form__field-holder {
       flex: 1 0 100%;
       max-width: 900px;
     }

diff --git a/client/src/styles/admin.scss b/client/src/styles/admin.scss
@@ -64,7 +64,7 @@
 
 .ss-gridfield-orderable.elemental-editor .col-reorder .handle {
   opacity: .5;
-  padding: 22px 0 0 0;
+  padding: 22px 0 0;
 
   .icon {
     font-size: 1.3em;
@@ -108,7 +108,6 @@
 
   .form__field-label,
   .form__field-holder {
-
     @include media-breakpoint-up(lg) {
       @include make-col(10);
       // To bring checkboxes and radio buttons into alignment

diff --git a/client/src/styles/history.scss b/client/src/styles/history.scss
@@ -58,10 +58,8 @@ div.elemental-area__element--historic.elemental-area__element--historic-inner {
 
 .elemental-area--read-only {
   border-bottom: 1px solid $border-color-light;
-  margin-bottom: ($panel-padding-y * 1.5);
-  margin-top: ($panel-padding-y * 1.5);
-  margin-left: -$panel-padding-x;
-  margin-right: -$panel-padding-x;
+  /* stylelint-disable-next-line scss/operator-no-unspaced */
+  margin: ($panel-padding-y * 1.5) -$panel-padding-x;
 }
 
 .history-viewer__version-detail fieldset {

diff --git a/package.json b/package.json
@@ -12,10 +12,10 @@
     "test": "jest",
     "coverage": "jest --coverage",
     "lock": "npm-shrinkwrap --dev",
-    "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"
   },
   "repository": {
     "type": "git",
@@ -51,7 +51,7 @@
     "reselect": "^4.1.7"
   },
   "devDependencies": {
-    "@silverstripe/eslint-config": "^1.2.1",
+    "@silverstripe/eslint-config": "^1.3.0",
     "@silverstripe/webpack-config": "^2.1.0",
     "@testing-library/react": "^14.0.0",
     "babel-jest": "^29.2.2",