From eedc8049db0da028f3231609bc4841e8fcdd095f Mon Sep 17 00:00:00 2001 From: tamaina Date: Thu, 1 Jun 2023 12:03:07 +0000 Subject: [PATCH 1/2] fix(frontend): make scrollbar-color track transparent Fix #9414 --- packages/frontend/src/style.scss | 2 +- packages/frontend/src/ui/deck/column.vue | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/packages/frontend/src/style.scss b/packages/frontend/src/style.scss index 70d48d2da0..b376e4c42d 100644 --- a/packages/frontend/src/style.scss +++ b/packages/frontend/src/style.scss @@ -34,7 +34,7 @@ html { tab-size: 2; &, * { - scrollbar-color: var(--scrollbarHandle) inherit; + scrollbar-color: var(--scrollbarHandle) transparent; scrollbar-width: thin; &::-webkit-scrollbar { diff --git a/packages/frontend/src/ui/deck/column.vue b/packages/frontend/src/ui/deck/column.vue index 1051f643dc..c376eb2b47 100644 --- a/packages/frontend/src/ui/deck/column.vue +++ b/packages/frontend/src/ui/deck/column.vue @@ -304,6 +304,7 @@ function onDrop(ev) { &::-webkit-scrollbar-track { background: transparent; } + scrollbar-color: var(--scrollbarHandle) transparent; } } @@ -316,6 +317,7 @@ function onDrop(ev) { &::-webkit-scrollbar-track { background: inherit; } + scrollbar-color: var(--scrollbarHandle) transparent; } } } @@ -400,5 +402,6 @@ function onDrop(ev) { &::-webkit-scrollbar-track { background: var(--panel); } + scrollbar-color: var(--scrollbarHandle) var(--panel); } From 8bdf0dd135a2455a2a8fefb3b5c324b0ecb04e78 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Acid=20Chicken=20=28=E7=A1=AB=E9=85=B8=E9=B6=8F=29?= Date: Thu, 1 Jun 2023 23:27:58 +0900 Subject: [PATCH 2/2] test: ignore `MkImgWithBlurhash` to avoid unstable snapshots --- packages/frontend/src/components/MkImgWithBlurhash.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/frontend/src/components/MkImgWithBlurhash.vue b/packages/frontend/src/components/MkImgWithBlurhash.vue index b07617b37e..672a28f6d0 100644 --- a/packages/frontend/src/components/MkImgWithBlurhash.vue +++ b/packages/frontend/src/components/MkImgWithBlurhash.vue @@ -1,5 +1,5 @@