fix: listitem hardcode css variable

pull/10132/head
Tienson Qin 2023-11-13 13:37:21 +08:00
parent 80703328b0
commit eaadd462ff
3 changed files with 22 additions and 24 deletions

View File

@ -36,26 +36,26 @@
(let [normalized-text (normalize-text app-config text)] (let [normalized-text (normalize-text app-config text)]
(loop [[query-token & more] (string/split normal-query #" ") (loop [[query-token & more] (string/split normal-query #" ")
result [[:text (to-string text)]]] result [[:text (to-string text)]]]
(if-not query-token (if-not query-token
(->> result (->> result
(map (fn [[type value]] (map (fn [[type value]]
(if (= type :text) (if (= type :text)
[:span value] [:span value]
[:span {:style {:background "var(--lx-accent-09)"}} value]))) [:span {:class "shui__list-item-highlighted-span"} value])))
(into [:span])) (into [:span]))
(->> result (->> result
(mapcat (fn [[type value]] (mapcat (fn [[type value]]
(let [include-token? (and (= type :text) (string? value) (let [include-token? (and (= type :text) (string? value)
(string/includes? normalized-text query-token))] (string/includes? normalized-text query-token))]
(if include-token? (if include-token?
(let [normal-value (normalize-text app-config value) (let [normal-value (normalize-text app-config value)
normal-query-token (normalize-text app-config query-token) normal-query-token (normalize-text app-config query-token)
[before-text highlighted-text after-text] (split-text-on-highlight value query-token normal-value normal-query-token)] [before-text highlighted-text after-text] (split-text-on-highlight value query-token normal-value normal-query-token)]
[[:text before-text] [[:text before-text]
[:match highlighted-text] [:match highlighted-text]
[:text after-text]]) [:text after-text]])
[[type value]])))) [[type value]]))))
(recur more)))))) (recur more))))))
(defn highlight-query* [app-config query text] (defn highlight-query* [app-config query text]
(if (vector? text) ; hiccup (if (vector? text) ; hiccup

View File

@ -612,8 +612,6 @@
(rum/use-effect! (fn [] (rum/use-effect! (fn []
(js/setTimeout #(when (some-> input-ref deref) (.focus @input-ref)) 0)) (js/setTimeout #(when (some-> input-ref deref) (.focus @input-ref)) 0))
[]) [])
; [:div {:style {:background "var(--lx-gray-02)"
; :border-bottom "1px solid var(--lx-gray-07)"}}]
[:div {:class "bg-gray-02 border-b border-1 border-gray-07"} [:div {:class "bg-gray-02 border-b border-1 border-gray-07"}
[:input#search [:input#search
{:class "text-xl bg-transparent border-none w-full outline-none px-3 py-3" {:class "text-xl bg-transparent border-none w-full outline-none px-3 py-3"

View File

@ -168,12 +168,12 @@
} }
&:hover { &:hover {
background-color: or(--ls-left-sidebar-hover-background, --lx-gray-04, --ls-tertiary-background-color); background-color: or(--ls-left-sidebar-hover-background, --lx-gray-04, --ls-primary-background-color);
color: or(--ls-left-sidebar-text-color-hover, --lx-gray-12); color: or(--ls-left-sidebar-text-color-hover, --lx-gray-12);
} }
&.active, &:active { &.active, &:active {
background-color: or(--ls-left-sidebar-active-background, --lx-gray-04, --ls-quaternary-background-color); background-color: or(--ls-left-sidebar-active-background, --lx-gray-04, --ls-primary-background-color);
color: or(--ls-left-sidebar-active-text-color, --lx-gray-12); color: or(--ls-left-sidebar-active-text-color, --lx-gray-12);
.ui__icon { .ui__icon {
opacity: .9; opacity: .9;