Skip to content

Commit b4c4b67

Browse files
committed
enhance(ux): set background color for full block instead of title
fixes logseq/db-test#560 fixes logseq/db-test#253
1 parent 33ae3f9 commit b4c4b67

File tree

1 file changed

+14
-12
lines changed

1 file changed

+14
-12
lines changed

src/main/frontend/components/block.cljs

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2355,7 +2355,6 @@
23552355
block-ref? (:block-ref? config)
23562356
block-type (or (keyword (pu/lookup block :logseq.property/ls-type)) :default)
23572357
html-export? (:html-export? config)
2358-
bg-color (pu/lookup block :logseq.property/background-color)
23592358
;; `heading-level` is for backward compatibility, will remove it in later releases
23602359
heading-level (:block/heading-level block)
23612360
heading (or
@@ -2376,14 +2375,7 @@
23762375
(when (and marker
23772376
(not (string/blank? marker))
23782377
(not= "nil" marker))
2379-
{:data-marker (str (string/lower-case marker))})
2380-
(when bg-color
2381-
(let [built-in-color? (ui/built-in-color? bg-color)]
2382-
{:style {:background-color (if built-in-color?
2383-
(str "var(--ls-highlight-color-" bg-color ")")
2384-
bg-color)
2385-
:color (when-not built-in-color? "white")}
2386-
:class "px-1 with-bg-color"})))
2378+
{:data-marker (str (string/lower-case marker))}))
23872379

23882380
;; children
23892381
(let [area? (= :area (keyword (pu/lookup block :logseq.property.pdf/hl-type)))
@@ -3157,10 +3149,20 @@
31573149
raw-mode-block (state/sub :editor/raw-mode-block)
31583150
type-block-editor? (and (contains? #{:code} (:logseq.property.node/display-type block))
31593151
(not= (:db/id block) (:db/id raw-mode-block)))
3160-
config (assoc config :block-parent-id block-id)]
3152+
config (assoc config :block-parent-id block-id)
3153+
bg-color (pu/lookup block :logseq.property/background-color)]
31613154
[:div.block-content-or-editor-wrap
3162-
{:class (when (:page-title? config) "ls-page-title-container")
3163-
:data-node-type (some-> (:logseq.property.node/display-type block) name)}
3155+
(merge
3156+
{:class (util/classnames [{"ls-page-title-container" (:page-title? config)
3157+
"px-1 with-bg-color" bg-color}])
3158+
:data-node-type (some-> (:logseq.property.node/display-type block) name)}
3159+
(when bg-color
3160+
(let [built-in-color? (ui/built-in-color? bg-color)]
3161+
{:style {:background-color (if built-in-color?
3162+
(str "var(--ls-highlight-color-" bg-color ")")
3163+
bg-color)
3164+
:color (when-not built-in-color? "white")}})))
3165+
31643166
(when (and db-based? (not table?)) (block-positioned-properties config block :block-left))
31653167
[:div.block-content-or-editor-inner
31663168
[:div.block-row.flex.flex-1.flex-row.gap-1.items-center

0 commit comments

Comments
 (0)