From 0d04e777fceafd915469ec792e59967090e04302 Mon Sep 17 00:00:00 2001 From: charlie Date: Fri, 25 Nov 2022 14:49:10 +0800 Subject: [PATCH] fix(ui): style not refresh when toggling option for the fold button position --- src/main/frontend/components/block.cljs | 6 +----- src/main/frontend/components/block.css | 9 +++++++++ src/main/frontend/components/theme.css | 5 +++++ src/main/frontend/handler/config.cljs | 2 +- 4 files changed, 16 insertions(+), 6 deletions(-) diff --git a/src/main/frontend/components/block.cljs b/src/main/frontend/components/block.cljs index db33e04f385..16d766e16e4 100644 --- a/src/main/frontend/components/block.cljs +++ b/src/main/frontend/components/block.cljs @@ -1712,11 +1712,7 @@ ref? (:ref? config) empty-content? (block-content-empty? block) fold-button-right? (state/enable-fold-button-right?)] - [:div.mr-1.flex.flex-row.items-center.sm:mr-2 - {:style {:height 24 - :margin-top 0 - :float "left"}} - + [:div.block-control-wrap.mr-1.flex.flex-row.items-center.sm:mr-2 (when (or (not fold-button-right?) has-child?) [:a.block-control {:id (str "control-" uuid) diff --git a/src/main/frontend/components/block.css b/src/main/frontend/components/block.css index d7a5ae3a6d2..5f667ce9aeb 100644 --- a/src/main/frontend/components/block.css +++ b/src/main/frontend/components/block.css @@ -172,6 +172,11 @@ } } +.block-control-wrap { + height: 24px; + margin-top: 0; +} + .block-control, .block-control:hover { text-decoration: none; cursor: default; @@ -523,6 +528,10 @@ a:hover > .bullet-container { display: none; } + .block-children { + border-left: none; + } + .hide-inner-bullet .bullet { display: none; } diff --git a/src/main/frontend/components/theme.css b/src/main/frontend/components/theme.css index ab35c355e52..6e6d08787cd 100644 --- a/src/main/frontend/components/theme.css +++ b/src/main/frontend/components/theme.css @@ -122,6 +122,11 @@ main.ls-fold-button-on-right { .page-blocks-inner { margin-left: 0 !important; } + + .block-control-wrap { + height: unset; + background: transparent; + } } .cp__sidebar-left-layout { diff --git a/src/main/frontend/handler/config.cljs b/src/main/frontend/handler/config.cljs index 80d91509c8e..b432db78363 100644 --- a/src/main/frontend/handler/config.cljs +++ b/src/main/frontend/handler/config.cljs @@ -27,7 +27,7 @@ ks (if (vector? k) k [k]) new-result (rewrite/assoc-in result ks v) new-content (str new-result)] - (file-handler/set-file-content! repo path new-content))))) + (file-handler/set-file-content! repo path new-content) nil)))) (defn set-config! ([k v]