diff --git a/src/main/frontend/common.css b/src/main/frontend/common.css index c943533db3..ff07ef4eea 100644 --- a/src/main/frontend/common.css +++ b/src/main/frontend/common.css @@ -469,7 +469,7 @@ a.tag { } .preview-ref-link { - @apply inline-block; + @apply inline-flex; & + &, & + a.tag, a.tag + & { @apply mx-[3px]; @@ -478,12 +478,6 @@ a.tag { .block-title-wrap.as-heading { @apply my-0 pb-0; } - - .page-ref { - .ui__icon.ti { - @apply relative left-[2px] top-[5px]; - } - } } svg.note { diff --git a/src/main/frontend/components/all_pages.cljs b/src/main/frontend/components/all_pages.cljs index eff8985c46..ed740b0727 100644 --- a/src/main/frontend/components/all_pages.cljs +++ b/src/main/frontend/components/all_pages.cljs @@ -17,7 +17,7 @@ (->> [{:id :block/title :name (t :block/name) :cell (fn [_table row _column] - (component-block/page-cp {} row)) + (component-block/page-cp {:show-icon? true} row)) :type :string} {:id :block/type :name "Type" diff --git a/src/main/frontend/components/block.cljs b/src/main/frontend/components/block.cljs index 89721b3cbd..e85393fe6c 100644 --- a/src/main/frontend/components/block.cljs +++ b/src/main/frontend/components/block.cljs @@ -616,7 +616,8 @@ (util/page-name-sanity-lc (:block/title page-entity))) breadcrumb? (:breadcrumb? config) config (assoc config :whiteboard-page? whiteboard-page?) - untitled? (when page-name (model/untitled-page? (:block/title page-entity)))] + untitled? (when page-name (model/untitled-page? (:block/title page-entity))) + show-icon? (:show-icon? config)] [:a.relative {:tabIndex "0" :class (cond-> @@ -654,6 +655,10 @@ :on-key-up (fn [e] (when (and e (= (.-key e) "Enter") (not meta-click?)) (state/clear-edit!) (open-page-ref config page-entity e page-name contents-page?)))} + (when show-icon? + (when-let [icon (icon-component/get-node-icon-cp page-entity {:color? true :not-text-or-page? true})] + [:span.mr-1 + icon])) [:span (if (and (coll? children) (seq children)) (for [child children] @@ -679,7 +684,7 @@ s (cond untitled? (t :untitled) - ;; The page-name-in-block generated by the auto-complete is not page-name-sanitized + ;; The page-name-in-block generated by the auto-complete is not page-name-sanitized (pdf-utils/hls-file? page-name) (pdf-utils/fix-local-asset-pagename page-name) @@ -946,7 +951,11 @@ show-brackets? (if (some? show-brackets?) show-brackets? (state/show-brackets?)) block-uuid (:block/uuid config) contents-page? (= "contents" (string/lower-case (str id))) - block (db/get-page s)] + block (db/get-page s) + config' (assoc config + :label (mldoc/plain->text label) + :contents-page? contents-page? + :show-icon? true?)] (cond (string/ends-with? s ".excalidraw") [:div.draw {:on-click (fn [e] @@ -960,20 +969,14 @@ (not html-export?) (not contents-page?)) [:span.text-gray-500.bracket page-ref/left-brackets]) - (page-cp (assoc config - :label (mldoc/plain->text label) - :contents-page? contents-page?) - {:block/name s}) + (page-cp config' {:block/name s}) (when (and (or show-brackets? nested-link?) (not html-export?) (not contents-page?)) [:span.text-gray-500.bracket page-ref/right-brackets])] :else - (page-cp (assoc config - :label (mldoc/plain->text label) - :contents-page? contents-page?) - {:block/name s}))))) + (page-cp config' {:block/name s}))))) (defn- latex-environment-content [name option content] @@ -3328,7 +3331,7 @@ (:db/id block) (pu/get-pid :logseq.property/icon) (select-keys icon [:id :type :color])) - ;; del + ;; del (db-property-handler/remove-block-property! (:db/id block) (pu/get-pid :logseq.property/icon)))) diff --git a/src/main/frontend/components/block.css b/src/main/frontend/components/block.css index 6af8f2895a..809ef90bf1 100644 --- a/src/main/frontend/components/block.css +++ b/src/main/frontend/components/block.css @@ -85,7 +85,13 @@ @apply justify-between items-center; } +.page-ref { + @apply inline-flex items-center; +} + .breadcrumb { + @apply flex flex-row items-center; + .asset-container > img { height: 18px; width: unset !important; @@ -98,11 +104,6 @@ } &.block-parents { - .ui__icon { - position: relative; - top: 4px; - } - a { color: var(--ls-primary-text-color); @@ -111,10 +112,6 @@ } } } - - .page-ref { - @apply inline-flex items-baseline; - } } .open-block-ref-link { @@ -349,7 +346,7 @@ } .page-reference { - @apply rounded transition-[background]; + @apply inline-flex items-center rounded transition-[background]; .bracket { @apply opacity-30; @@ -361,16 +358,11 @@ } .page-ref { - @apply inline; color: var(--lx-accent-11, var(--ls-link-text-color, hsl(var(--primary)/.8))); &:hover { color: var(--lx-accent-11, var(--ls-link-text-color, hsl(var(--primary)))); } - - .ui__icon.ti { - @apply relative top-[3px] left-0; - } } .asset-ref { @@ -937,7 +929,7 @@ html.is-mac { height: 38px; } -.ls-page-title .positioned-properties svg { +.ls-page-title .positioned-properties svg, .page-ref svg { width: 16px; height: 16px; } diff --git a/src/main/frontend/components/icon.cljs b/src/main/frontend/components/icon.cljs index efc90ef5ea..ae0b6c06f9 100644 --- a/src/main/frontend/components/icon.cljs +++ b/src/main/frontend/components/icon.cljs @@ -62,7 +62,7 @@ [node-entity opts] (let [opts' (assoc opts :size 14) node-icon (get-node-icon node-entity)] - (when-not (string/blank? node-icon) + (when-not (or (string/blank? node-icon) (and (contains? #{"letter-n" "page"} node-icon) (:not-text-or-page? opts))) [:span.flex (merge {:style {:color (or (:color node-icon) "inherit")}} (select-keys opts [:class])) (icon node-icon opts')])))