diff --git a/.stylelintignore b/.stylelintignore deleted file mode 100644 index 405a4b6..0000000 --- a/.stylelintignore +++ /dev/null @@ -1,2 +0,0 @@ -client/src/**/*.js -client/src/images diff --git a/client/src/components/TOTP/Register.scss b/client/src/components/TOTP/Register.scss index 5901459..a99b32e 100644 --- a/client/src/components/TOTP/Register.scss +++ b/client/src/components/TOTP/Register.scss @@ -1,6 +1,6 @@ $totp-img-size: 200px; $scan-qr-height: 160px; -$scan-qr-manual-border-color: #cccccc; +$scan-qr-manual-border-color: #ccc; $color-status-bad: rgba(169, 30, 46, 1); // $color-message-error from mfa module $viewport-small: 480px; $viewport-medium: 768px; diff --git a/package.json b/package.json index 4b2ec94..c720bac 100644 --- a/package.json +++ b/package.json @@ -12,7 +12,7 @@ "test": "jest", "coverage": "jest --passWithNoTests --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" @@ -26,7 +26,7 @@ "react-dom": "^18.2.0" }, "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", diff --git a/yarn.lock b/yarn.lock index 8c098b8..ae5c4e5 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1566,10 +1566,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"