From 67cd09db6db49ea52dd9ddc1344dffec941ef666 Mon Sep 17 00:00:00 2001 From: snowrain Date: Thu, 6 Jun 2024 18:09:04 +0800 Subject: [PATCH 1/3] Fix(black-list): Increase the width of the popup box and add a scrollbar (fix #4749) --- .../utils/black-list/BlackListSettings.vue | 25 ++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) diff --git a/registry/lib/components/utils/black-list/BlackListSettings.vue b/registry/lib/components/utils/black-list/BlackListSettings.vue index 15301ee8a..6f2a0594f 100644 --- a/registry/lib/components/utils/black-list/BlackListSettings.vue +++ b/registry/lib/components/utils/black-list/BlackListSettings.vue @@ -115,7 +115,7 @@ export default Vue.extend({ @import 'common'; .custom-black-list-settings { @include popup(); - width: 400px; + width: 800px; font-size: 14px; padding: 12px 12px 12px 18px; left: 50%; @@ -147,6 +147,7 @@ export default Vue.extend({ } } .black-list-settings-content { + .black-list-settings-section { margin-top: 12px; > :not(:last-child) { @@ -167,6 +168,28 @@ export default Vue.extend({ line-height: 1.5; } &-content { + margin-top: 20px; + max-height: 400px; + padding: 10px; + overflow: auto; + + scrollbar-width: thin; + scrollbar-color: #888 #eee; + + -ms-overflow-style: -ms-autohiding-scrollbar; + &::-webkit-scrollbar { + width: 12px; + } + + &::-webkit-scrollbar-track { + background: #eee; + } + + &::-webkit-scrollbar-thumb { + background-color: #888; + border-radius: 10px; + border: 3px solid #eee; + } @include h-center(); flex-wrap: wrap; .be-slider { From 461b4f81b5c38055348cba03b6e1f82a4b989e5d Mon Sep 17 00:00:00 2001 From: snowrain Date: Thu, 6 Jun 2024 18:21:21 +0800 Subject: [PATCH 2/3] fix(black-list): lint-fix --- .../components/utils/black-list/BlackListSettings.vue | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/registry/lib/components/utils/black-list/BlackListSettings.vue b/registry/lib/components/utils/black-list/BlackListSettings.vue index 6f2a0594f..0f3152b2f 100644 --- a/registry/lib/components/utils/black-list/BlackListSettings.vue +++ b/registry/lib/components/utils/black-list/BlackListSettings.vue @@ -147,7 +147,6 @@ export default Vue.extend({ } } .black-list-settings-content { - .black-list-settings-section { margin-top: 12px; > :not(:last-child) { @@ -178,17 +177,17 @@ export default Vue.extend({ -ms-overflow-style: -ms-autohiding-scrollbar; &::-webkit-scrollbar { - width: 12px; + width: 12px; } &::-webkit-scrollbar-track { - background: #eee; + background: #eee; } &::-webkit-scrollbar-thumb { - background-color: #888; - border-radius: 10px; - border: 3px solid #eee; + background-color: #888; + border-radius: 10px; + border: 3px solid #eee; } @include h-center(); flex-wrap: wrap; From c992e019cb665427419d0ed7533cbb303133d8c5 Mon Sep 17 00:00:00 2001 From: snowrain Date: Sat, 15 Jun 2024 15:08:57 +0800 Subject: [PATCH 3/3] =?UTF-8?q?fix(black-list):=E5=8E=BB=E6=8E=89=E6=BB=9A?= =?UTF-8?q?=E5=8A=A8=E6=9D=A1ie=E5=92=8C=E6=97=A9=E6=9C=9Fedge=E5=85=BC?= =?UTF-8?q?=E5=AE=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- registry/lib/components/utils/black-list/BlackListSettings.vue | 1 - 1 file changed, 1 deletion(-) diff --git a/registry/lib/components/utils/black-list/BlackListSettings.vue b/registry/lib/components/utils/black-list/BlackListSettings.vue index 0f3152b2f..2df460b6a 100644 --- a/registry/lib/components/utils/black-list/BlackListSettings.vue +++ b/registry/lib/components/utils/black-list/BlackListSettings.vue @@ -175,7 +175,6 @@ export default Vue.extend({ scrollbar-width: thin; scrollbar-color: #888 #eee; - -ms-overflow-style: -ms-autohiding-scrollbar; &::-webkit-scrollbar { width: 12px; }