clone/logseq
1
0
Fork 0
mirror of https://github.com/logseq/logseq.git synced 2026-04-27 23:54:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Enhance: Color system (#6821)

Browse Source 
* refactor: remove redundant utility classes

* chore: expose tailwind colors to css vars

* refactor: introduce error/warning/success colors

* fix: move tailwind utilities import

* fix: extend tailwind font sizes

* fix: exclude color classes from purge

* refactor: admonition component

* fix: admonition warning color

* fix: notification icon color

* fix: capitalize icon title

* chore: remove caution color

* feat: highlighting system

* chore: add color title and remove comment

* chore: add color translations

* chore: add missing bg classes

* refactor: highlight system

* fix: color id

* fix: bg color value

* fix: pdf highlight colors

* fix: resolve conflicts

* fix: class directive typo
This commit is contained in:
Konstantinos
2022-10-07 06:54:06 +03:00
committed by GitHub
parent 35763e75ce
commit 6007d6061f
19 changed files with 196 additions and 500 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
src/main/frontend/components/block.cljs
View File

@@ -239,7 +239,7 @@
(if (or (not asset-file?)
(and exist? (not loading?)))
(content-fn)
[:p.text-red-500.text-xs [:small.opacity-80
[:p.text-error.text-xs [:small.opacity-80
(util/format "%s not found!" (string/capitalize type))]])))))
(defn open-lightbox
@@ -1877,8 +1877,10 @@
(not= "nil" marker))
{:class (str (string/lower-case marker))})
(when bg-color
{:style {:background-color bg-color}
:class "with-bg-color"}))
{:style {:background-color (if (some #{bg-color} ui/block-background-colors)
(str "var(--ls-highlight-color-" bg-color ")")
bg-color)}
:class "px-1 with-bg-color"}))
(remove-nils
(concat
[(when-not slide? checkbox)
@@ -3097,22 +3099,6 @@
{:debug-id q
:trigger-once? false})))
(defn admonition
[config type result]
(when-let [icon (case (string/lower-case (name type))
"note" svg/note
"tip" svg/tip
"important" svg/important
"caution" svg/caution
"warning" svg/warning
"pinned" svg/pinned
nil)]
[:div.flex.flex-row.admonitionblock.align-items {:class type}
[:div.pr-4.admonition-icon.flex.flex-col.justify-center
{:title (string/upper-case type)} (icon)]
[:div.ml-4.text-lg
(markup-elements-cp config result)]]))
;; TODO: move to mldoc
;; (defn- convert-md-src-to-custom-block
;; [item]
@@ -3256,22 +3242,22 @@
(ui/block-error "Invalid query:" {:content content})))
["Custom" "note" _options result _content]
(admonition config "note" result)
(ui/admonition "note" (markup-elements-cp config result))
["Custom" "tip" _options result _content]
(admonition config "tip" result)
(ui/admonition "tip" (markup-elements-cp config result))
["Custom" "important" _options result _content]
(admonition config "important" result)
(ui/admonition "important" (markup-elements-cp config result))
["Custom" "caution" _options result _content]
(admonition config "caution" result)
(ui/admonition "caution" (markup-elements-cp config result))
["Custom" "warning" _options result _content]
(admonition config "warning" result)
(ui/admonition "warning" (markup-elements-cp config result))
["Custom" "pinned" _options result _content]
(admonition config "pinned" result)
(ui/admonition "pinned" (markup-elements-cp config result))
["Custom" "center" _options l _content]
(->elem