From a31c530de5b624f6f58044ae5388fbd1c9a8b9e3 Mon Sep 17 00:00:00 2001 From: Tienson Qin Date: Sun, 12 Nov 2023 22:58:02 +0800 Subject: [PATCH] fix: color-level class --- src/main/frontend/components/block.cljs | 12 +++--------- src/main/frontend/components/block.css | 4 ++-- src/main/frontend/components/container.css | 7 +++++-- src/main/frontend/components/reference.css | 4 ++++ 4 files changed, 14 insertions(+), 13 deletions(-) diff --git a/src/main/frontend/components/block.cljs b/src/main/frontend/components/block.cljs index 8d7a69a2f34..8a1aed64409 100644 --- a/src/main/frontend/components/block.cljs +++ b/src/main/frontend/components/block.cljs @@ -3486,9 +3486,7 @@ page (db/entity (:db/id page)) blocks (tree/non-consecutive-blocks->vec-tree blocks) parent-blocks (group-by :block/parent blocks)] - [:div.my-2 (cond-> {:key (str "page-" (:db/id page))} - (:ref? config) - (assoc :class "color-level px-2 sm:px-7 py-2 rounded")) + [:div.custom-query-page-result.color-level {:key (str "page-" (:db/id page))} (ui/foldable [:div (page-cp config page) @@ -3514,9 +3512,7 @@ page (db/entity (:db/id page)) ;; FIXME: parents need to be sorted parent-blocks (group-by :block/parent page-blocks)] - [:div.my-2 (cond-> {:key (str "page-" (:db/id page))} - (:ref? config) - (assoc :class "color-level px-2 sm:px-7 py-2 rounded")) + [:div.my-2 {:key (str "page-" (:db/id page))} (ui/foldable [:div (page-cp config page) @@ -3544,9 +3540,7 @@ (let [alias? (:block/alias? page) page (db/entity (:db/id page)) whiteboard? (model/whiteboard-page? page)] - [:div.my-2 (cond-> {:key (str "page-" (:db/id page))} - (:ref? config) - (assoc :class "color-level px-2 sm:px-7 py-2 rounded")) + [:div.my-2 {:key (str "page-" (:db/id page))} (ui/foldable [:div (page-cp config page) diff --git a/src/main/frontend/components/block.css b/src/main/frontend/components/block.css index fc647dbf011..8bfee44d324 100644 --- a/src/main/frontend/components/block.css +++ b/src/main/frontend/components/block.css @@ -478,9 +478,9 @@ } .color-level { - background-color: var(--ls-right-sidebar-content-background, --lx-gray-02, --color-level-1); + background-color: or(--ls-right-sidebar-content-background, --lx-gray-02, --color-level-1); .dark & { - background-color: var(--ls-right-sidebar-content-background, --lx-gray-01, --color-level-1); + background-color: or(--ls-right-sidebar-content-background, --lx-gray-01, --color-level-1); } & .color-level { diff --git a/src/main/frontend/components/container.css b/src/main/frontend/components/container.css index 93c5653d418..eb09c979dc1 100644 --- a/src/main/frontend/components/container.css +++ b/src/main/frontend/components/container.css @@ -128,12 +128,15 @@ .nav-header a { .keyboard-shortcut { - @apply w-0 opacity-0; - transition: opacity 0.3s; + @apply w-0 opacity-0; + visibility: hidden; } &:hover { .keyboard-shortcut { + visibility: visible; + transition: opacity 1s; + transition-delay: 2s; width: auto; opacity: 1; } diff --git a/src/main/frontend/components/reference.css b/src/main/frontend/components/reference.css index 8e0aa3de328..0a206843949 100644 --- a/src/main/frontend/components/reference.css +++ b/src/main/frontend/components/reference.css @@ -18,3 +18,7 @@ .ls-filters { max-width: 704px; } + +.custom-query-page-result { + @apply p-2 my-2 rounded; +}