MNT Fix scss lint warnings

silverstripe · Jun 10, 2024 · 26e8c38 · 26e8c38
1 parent 384a78b
commit 26e8c38
Show file tree

Hide file tree

Showing 13 changed files with 427 additions and 818 deletions.
diff --git a/.stylelintignore b/.stylelintignore
diff --git a/client/dist/styles/bundle-cms.css b/client/dist/styles/bundle-cms.css
diff --git a/client/dist/styles/bundle.css b/client/dist/styles/bundle.css
diff --git a/client/src/bundles/bundle-cms.scss b/client/src/bundles/bundle-cms.scss
@@ -1,13 +1,9 @@
 // Core variables
 @import 'variables';
-
 @import '../styles/mfa-variables';
 @import '../styles/mfa';
-
 @import '../containers/Login';
 
-@import '../styles/mfa-variables';
-
 // Component styles
 @import '../components/FormField/RegisteredMFAMethodListField/AccountResetUI';
 @import '../components/FormField/RegisteredMFAMethodListField/RegisteredMFAMethodListField';

diff --git a/client/src/bundles/bundle.scss b/client/src/bundles/bundle.scss
@@ -1,6 +1,5 @@
 // Core variables
 @import 'variables';
-
 @import '../styles/mfa-variables';
 
 // Base style

diff --git a/client/src/components/BackupCodes/Register.scss b/client/src/components/BackupCodes/Register.scss
@@ -4,7 +4,6 @@
     flex-wrap: wrap;
     justify-content: space-between;
     max-width: 375px;
-
     border: 1px dashed $gray-300;
     font-weight: bold;
 

diff --git a/client/src/components/LoadingIndicator.scss b/client/src/components/LoadingIndicator.scss
@@ -21,7 +21,7 @@
   animation: $loading-indicator-animation;
 }
 
-@-webkit-keyframes spinner-loader {
+@keyframes spinner-loader {
   0% {
     -webkit-transform: rotate(0deg);
     transform: rotate(0deg);
@@ -31,6 +31,7 @@
     transform: rotate(360deg);
   }
 }
+
 @keyframes spinner-loader {
   0% {
     -webkit-transform: rotate(0deg);

diff --git a/client/src/components/Register.scss b/client/src/components/Register.scss
@@ -4,7 +4,7 @@
 
 .mfa-register-confirmation {
   text-align: center;
-  margin: 3em auto 3em;
+  margin: 3em auto;
 
   &__icon {
     line-height: 1;

diff --git a/client/src/components/Register/MethodTile.scss b/client/src/components/Register/MethodTile.scss
@@ -86,7 +86,7 @@
       border-top-right-radius: $tile-border-radius;
       color: $color-tile-mask-text;
       left: 0;
-      padding: $tile-padding/2 $tile-padding;
+      padding: $tile-padding / 2 $tile-padding;
       position: absolute;
       top: 0;
       width: 100%;

diff --git a/client/src/components/Verify/SelectMethod.scss b/client/src/components/Verify/SelectMethod.scss
@@ -15,6 +15,7 @@
     @media (max-width: $viewport-medium) {
       display: none;
     }
+
     height: $method-image-dimensions;
     width: $method-image-dimensions;
     grid-column: 2;

diff --git a/client/src/styles/mfa-variables.scss b/client/src/styles/mfa-variables.scss
@@ -61,7 +61,7 @@ $color-tile-border: $color-grey-border;
 $color-tile-border-hover: lighten($color-tile-border, 9.5);
 $color-tile-border-active: $color-blue;
 $color-tile-mask-background: #4a4a4a;
-$color-tile-mask-text: white;
+$color-tile-mask-text: #fff;
 
 $dark-color-tile-border: $dark-color-grey-border;
 $dark-color-tile-border-hover: rgba(255, 255, 255, 0.1);

diff --git a/package.json b/package.json
@@ -14,7 +14,7 @@
     "test": "jest",
     "coverage": "jest --coverage --passWithNoTests",
     "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"