From 2f2fb780bfc2af9577dacaad8ee215d3484d4b65 Mon Sep 17 00:00:00 2001 From: Untone Date: Sun, 4 Feb 2024 17:39:05 +0300 Subject: [PATCH] all-fixed --- .lintstagedrc | 6 ++--- package.json | 6 +++-- .../Nav/AuthModal/AuthModal.module.scss | 1 - .../Nav/SearchModal/SearchModal.module.scss | 25 ++++++------------- .../ImageCropper/ImageCropper.module.scss | 1 - 5 files changed, 14 insertions(+), 25 deletions(-) diff --git a/.lintstagedrc b/.lintstagedrc index fb052ec8..aece3275 100644 --- a/.lintstagedrc +++ b/.lintstagedrc @@ -1,7 +1,5 @@ { "*.{js,ts,cjs,mjs,d.mts,jsx,tsx,json,jsonc}": [ - "biome check . --no-errors-on-unmatched --apply" - ], - "package.json": "sort-package-json", - "public/locales/**/*.json": "sort-json" + "npx @biomejs/biome check src --log-kind=compact --verbose --apply-unsafe && stylelint **/*.{scss,css} --fix" + ] } diff --git a/package.json b/package.json index d34f2265..0164698e 100644 --- a/package.json +++ b/package.json @@ -11,11 +11,13 @@ "deploy": "graphql-codegen && npm run typecheck && vite build && vercel", "dev": "vite", "e2e": "npx playwright test --project=chromium", - "fix": "npm run lint:code:fix && npm run lint:styles:fix", + "fix": "npm run check:code:fix && stylelint **/*.{scss,css} --fix", "format": "npx @biomejs/biome format src/. --write", "hygen": "HYGEN_TMPLS=gen hygen", "postinstall": "npm run codegen", - "lint": "npm run lint:code && npm run lint:styles", + "check:code": "npx @biomejs/biome check src --log-kind=compact --verbose", + "check:code:fix": "npx @biomejs/biome check src --log-kind=compact --verbose --apply-unsafe", + "lint": "npm run lint:code && stylelint **/*.{scss,css}", "lint:code": "npx @biomejs/biome lint src --log-kind=compact --verbose", "lint:code:fix": "npx @biomejs/biome lint src --apply-unsafe --log-kind=compact --verbose", "lint:styles": "stylelint **/*.{scss,css}", diff --git a/src/components/Nav/AuthModal/AuthModal.module.scss b/src/components/Nav/AuthModal/AuthModal.module.scss index f589c677..3c1c8af8 100644 --- a/src/components/Nav/AuthModal/AuthModal.module.scss +++ b/src/components/Nav/AuthModal/AuthModal.module.scss @@ -187,7 +187,6 @@ font-size: 12px; line-height: 16px; margin-top: 0.3em; - color: var(--danger-color); a { diff --git a/src/components/Nav/SearchModal/SearchModal.module.scss b/src/components/Nav/SearchModal/SearchModal.module.scss index 1dbc5039..a4f06662 100644 --- a/src/components/Nav/SearchModal/SearchModal.module.scss +++ b/src/components/Nav/SearchModal/SearchModal.module.scss @@ -1,11 +1,9 @@ -@mixin searchFilterControl { +@mixin search-filter-control { @include font-size(1.4rem); height: 4rem; - padding: 0 2rem; - - background: rgb(64 64 64 / 0.5); + background: rgb(64 64 64 / 50%); border-radius: 10rem; color: #fff; font-weight: 500; @@ -16,7 +14,7 @@ } &:active { - color: rgb(255 255 255 / 0.4); + color: rgb(255 255 255 / 40%); } } @@ -28,9 +26,7 @@ @include font-size(4.8rem); width: 100%; - padding: 0 0 0.5rem; - background: none; border: none; border-bottom: 2px solid #fff; @@ -39,14 +35,13 @@ outline: none; &::placeholder { - color: rgb(255 255 255 / 0.32); + color: rgb(255 255 255 / 32%); } &:not(:placeholder-shown) + .searchButton img { filter: invert(1); } - &::-moz-selection, &::selection { color: #2638d9; } @@ -56,7 +51,6 @@ position: absolute; right: 0; top: 2rem; - width: 3.2rem; height: 3.2rem; @@ -67,9 +61,10 @@ .searchDescription { margin-bottom: 44px; + @include font-size(1.6rem); - color: rgb(255 255 255 / 0.64); + color: rgb(255 255 255 / 64%); } .topicsList { @@ -77,12 +72,11 @@ flex-wrap: wrap; justify-content: center; gap: 1rem; - margin-top: 9.6rem !important; } .topTopic { - @include searchFilterControl; + @include search-filter-control; } .filterSwitcher { @@ -108,22 +102,19 @@ display: flex; flex-wrap: wrap; gap: 1rem; - margin: 6.4rem 0; } .filterResultsControl { - @include searchFilterControl; + @include search-filter-control; } .searchLoader { width: 28px; height: 28px; - border: 5px solid #fff; border-bottom-color: transparent; border-radius: 50%; - animation: rotation 1s linear infinite; } diff --git a/src/components/_shared/ImageCropper/ImageCropper.module.scss b/src/components/_shared/ImageCropper/ImageCropper.module.scss index 51e4dd01..f30ed563 100644 --- a/src/components/_shared/ImageCropper/ImageCropper.module.scss +++ b/src/components/_shared/ImageCropper/ImageCropper.module.scss @@ -5,6 +5,5 @@ .cropperControls { display: flex; justify-content: space-between; - margin-top: 2rem; }