mirror of
https://github.com/logseq/logseq.git
synced 2026-05-21 19:24:17 +00:00
Merge branch 'master' into feat/hnswlib+transformer-js
This commit is contained in:
@@ -490,7 +490,10 @@
|
|||||||
|
|
||||||
(let [property-desc (when-not (= (:db/ident property) :logseq.property/description)
|
(let [property-desc (when-not (= (:db/ident property) :logseq.property/description)
|
||||||
(:logseq.property/description property))]
|
(:logseq.property/description property))]
|
||||||
[:div.ls-block.property-value-container.flex.flex-row.gap-1.items-start
|
[:div.ls-block.property-value-container.flex.flex-row.gap-1
|
||||||
|
{:class (if (contains? #{:checkbox :date :datetime} type)
|
||||||
|
"items-center"
|
||||||
|
"items-start")}
|
||||||
|
|
||||||
(when-not (or block? (and property-desc (:class-schema? opts)))
|
(when-not (or block? (and property-desc (:class-schema? opts)))
|
||||||
[:div.flex.items-center {:style {:height 28}}
|
[:div.flex.items-center {:style {:height 28}}
|
||||||
|
|||||||
@@ -440,9 +440,11 @@
|
|||||||
hours (.getHours date)
|
hours (.getHours date)
|
||||||
minutes (.getMinutes date)]
|
minutes (.getMinutes date)]
|
||||||
[:span.select-none
|
[:span.select-none
|
||||||
(str (util/zero-pad hours)
|
(if (= 0 hours minutes)
|
||||||
":"
|
(ui/icon "edit" {:size 14 :class "text-muted-foreground hover:text-foreground align-middle"})
|
||||||
(util/zero-pad minutes))])]]
|
(str (util/zero-pad hours)
|
||||||
|
":"
|
||||||
|
(util/zero-pad minutes)))])]]
|
||||||
(if (or repeated-task? (contains? #{:logseq.property/deadline :logseq.property/scheduled} property-id))
|
(if (or repeated-task? (contains? #{:logseq.property/deadline :logseq.property/scheduled} property-id))
|
||||||
(overdue date content)
|
(overdue date content)
|
||||||
content))))
|
content))))
|
||||||
|
|||||||
Reference in New Issue
Block a user