From b92095400dc418454163c7b2af3120225e0e340c Mon Sep 17 00:00:00 2001 From: vladmandic Date: Sun, 4 Jan 2026 09:37:45 +0100 Subject: [PATCH] cleanup eslint Signed-off-by: vladmandic --- extensions-builtin/sdnext-modernui | 2 +- javascript/black-teal.css | 2 ++ javascript/sdnext.css | 45 +++++++++++++++--------------- package.json | 22 ++++++++------- 4 files changed, 38 insertions(+), 33 deletions(-) diff --git a/extensions-builtin/sdnext-modernui b/extensions-builtin/sdnext-modernui index c19496ea2..2fc3af453 160000 --- a/extensions-builtin/sdnext-modernui +++ b/extensions-builtin/sdnext-modernui @@ -1 +1 @@ -Subproject commit c19496ea2eac6e321b40114412836fa08a6010a3 +Subproject commit 2fc3af45330876bb058c3579bffaa1b86b5700fc diff --git a/javascript/black-teal.css b/javascript/black-teal.css index d6609bdd5..bcfe7f74d 100644 --- a/javascript/black-teal.css +++ b/javascript/black-teal.css @@ -77,8 +77,10 @@ button { max-width: 400px; white-space: nowrap; } img { background-color: var(--background-color); } input[type='range'] { display: block; margin: 0; padding: 0; height: 0.8em; background-color: transparent; overflow: hidden; cursor: pointer; box-shadow: 0 0 0 0 transparent; -webkit-appearance: none; appearance: none; } +/* eslint-disable-next-line css/no-invalid-properties */ input[type='range']::-webkit-slider-thumb { height: .9em; width: .9em; background-color: hsl(180, 54%, 61%); box-shadow: var(--range-shadow); border-radius: var(--radius-xs); } input[type='range']::-webkit-slider-runnable-track, input[type='range']::-webkit-slider-thumb { -webkit-appearance: none; } +/* eslint-disable-next-line css/no-invalid-properties */ input[type='range']::-moz-range-thumb { height: .9em; width: .9em; background-color: hsl(180, 54%, 61%); box-shadow: var(--range-shadow); } input[type='range']::-moz-range-track, input[type='range']::-webkit-slider-runnable-track { border: none; background: none; width: 100%; height: 100%; } diff --git a/javascript/sdnext.css b/javascript/sdnext.css index 5fe4badcb..fea7396ac 100644 --- a/javascript/sdnext.css +++ b/javascript/sdnext.css @@ -2031,42 +2031,43 @@ div:has(>#tab-gallery-folders) { .loading { color: white; - position: border-box; - top: 85%; - font-size: 1.5em; + left: 50%; + position: absolute; + top: 20%; + transform: translateX(-50%); } .loader { - width: 100px; - height: 100px; + animation: spin 4s linear infinite, hue 5s infinite alternate; border: var(--spacing-md) solid transparent; border-radius: 50%; - border-top: var(--spacing-md) solid var(--primary-600); - animation: spin 2s linear infinite, hue 5s infinite alternate; - position: border-box; + border-top: var(--spacing-md) solid var(--sd-main-accent-color); + height: 300px; + position: relative; + width: 300px; } -.loader::before, -.loader::after { - content: ""; - position: absolute; - top: 6px; - bottom: 6px; - left: 6px; - right: 6px; - border-radius: 50%; +.loader::before, .loader::after { border: var(--spacing-md) solid transparent; - animation: hue 5s infinite alternate; + border-radius: 50%; + bottom: 6px; + content: ""; + left: 6px; + position: absolute; + right: 6px; + top: 6px; } .loader::before { - border-top-color: var(--primary-900); - animation: spin 3s linear infinite; + animation: 3s spin linear infinite, hue 5s infinite alternate; + border-top-color: var(--sd-main-accent-color); + filter: brightness(50%); } .loader::after { - border-top-color: var(--primary-300); - animation: spin 1.5s linear infinite; + animation: spin 1.5s linear infinite, hue 5s infinite alternate; + border-top-color: var(--sd-main-accent-color); + filter: brightness(150%); } .docs-search textarea { diff --git a/package.json b/package.json index 76994efb7..6d0715922 100644 --- a/package.json +++ b/package.json @@ -20,18 +20,20 @@ "start": ". venv/bin/activate; python launch.py --debug", "localize": "node cli/localize.js", "packages": ". venv/bin/activate && pip install --upgrade transformers accelerate huggingface_hub safetensors tokenizers peft pytorch_lightning pylint ruff", - "eslint": "eslint . javascript/", - "ruff": ". venv/bin/activate && ruff check", - "pylint": ". venv/bin/activate && pylint *.py modules/ pipelines/ scripts/ extensions-builtin/ | grep -v '^*'", "format": ". venv/bin/activate && pre-commit run --all-files", - "lint": "npm run eslint && npm run format && npm run ruff && npm run pylint | grep -v TODO", - "todo": "npm run pylint | grep W0511 | awk -F'TODO ' '{print \"- \"$NF}' | sed 's/ (fixme)//g' | sort", - "eslint-win": "eslint . javascript/ --rule \"@stylistic/linebreak-style: off\"", - "ruff-win": "venv\\scripts\\activate && ruff check", - "pylint-win": "venv\\scripts\\activate && pylint *.py modules/ pipelines/ scripts/ extensions-builtin/", "format-win": "venv\\scripts\\activate && pre-commit run --all-files", - "lint-win": "npm run eslint-win && npm run format-win && npm run ruff-win && npm run pylint-win", - "test": ". venv/bin/activate; python launch.py --debug --test" + "eslint": "eslint . javascript/", + "eslint-win": "eslint . javascript/ --rule \"@stylistic/linebreak-style: off\"", + "eslint-ui": "cd extensions-builtin/sdnext-modernui && eslint . javascript/", + "eslint-ui-win": "cd extensions-builtin/sdnext-modernui && eslint . javascript/ --rule \"@stylistic/linebreak-style: off\"", + "ruff": ". venv/bin/activate && ruff check", + "ruff-win": "venv\\scripts\\activate && ruff check", + "pylint": ". venv/bin/activate && pylint *.py modules/ pipelines/ scripts/ extensions-builtin/ | grep -v '^*'", + "pylint-win": "venv\\scripts\\activate && pylint *.py modules/ pipelines/ scripts/ extensions-builtin/", + "lint": "npm run format && npm run eslint && npm run eslint-ui && npm run ruff && npm run pylint | grep -v TODO", + "lint-win": "npm run format-win && npm run eslint-win && npm run eslint-ui-win && npm run ruff-win && npm run pylint-win", + "test": ". venv/bin/activate; python launch.py --debug --test", + "todo": "npm run pylint | grep W0511 | awk -F'TODO ' '{print \"- \"$NF}' | sed 's/ (fixme)//g' | sort" }, "devDependencies": { "@eslint/compat": "^2.0.0",