Merge branch 'master' into enhance/mobile-ux-2

2026-04-27 15:45:00 +00:00 · 2022-12-06 12:46:15 +08:00
parent 00b903a4a6 1893dde335
commit cfdcd9410c
20 changed files with 5393 additions and 277 deletions
--- a/src/main/frontend/components/block.cljs
+++ b/src/main/frontend/components/block.cljs
@@ -1923,7 +1923,8 @@
      (when bg-color
        {:style {:background-color (if (some #{bg-color} ui/block-background-colors)
                                     (str "var(--ls-highlight-color-" bg-color ")")
-                                     bg-color)}
+                                     bg-color)
+                 :color (when-not (some #{bg-color} ui/block-background-colors) "white")}
         :class "px-1 with-bg-color"}))
     (remove-nils
      (concat