Jakob round III

novakda · Sep 29, 2023 · 328cd58 · 328cd58
1 parent 3106eef
commit 328cd58
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 11 deletions.
diff --git a/deps/shui/src/logseq/shui/list_item/v1.cljs b/deps/shui/src/logseq/shui/list_item/v1.cljs
@@ -35,10 +35,11 @@
 
 (defn split-text-on-highlight [text query normal-text normal-query]
   (let [start-index (string/index-of normal-text normal-query)
-        end-index (+ start-index (count query))]
-    [(subs text 0 start-index)
-     (subs text start-index end-index) 
-     (subs text end-index)]))
+        end-index (+ start-index (count query))
+        text-string (cond-> (or text "") (keyword? text) name str)]
+    [(subs text-string 0 start-index)
+     (subs text-string start-index end-index) 
+     (subs text-string end-index)]))
 
 (defn span-with-single-highlight-token [text query normal-text normal-query]
   (let [[before-text highlighted-text after-text] (split-text-on-highlight text query normal-text normal-query)]

diff --git a/src/main/frontend/colors.cljs b/src/main/frontend/colors.cljs
@@ -31,8 +31,8 @@
                           "--ls-quaternary-background-color: var(--rx-" (name gray) "-04); " 
                           "--ls-link-text-color: var(--rx-" (name color) "-11); "
                           "--ls-link-text-hover-color: var(--rx-" (name color) "-12); "
-                          "--ls-secondary-text-color: var(--rx-" (name gray) "-11); "
-                          "--ls-primary-text-color: var(--rx-" (name gray) "-12); "
+                          "--ls-secondary-text-color: var(--rx-" (name gray) "-12); "
+                          "--ls-primary-text-color: var(--rx-" (name gray) "-11); "
                           "--ls-border-color: var(--rx-" (name gray) "-05); "
                           "--ls-secondary-border-color: var(--rx-" (name color) "-05); "
                           "--ls-page-checkbox-color: var(--rx-" (name gray) "-07); "

diff --git a/src/main/frontend/components/block.css b/src/main/frontend/components/block.css
@@ -183,12 +183,12 @@
 }
 
 .block-children-left-border:hover {
-  background-color: var(--ls-primary-text-color);
+  background-color: or(--lx-gray-11, --ls-primary-text-color);
 }
 
 .block-children {
   border-left: 1px solid;
-  border-left-color: or(--logseq-og-guideline-color, --lx-gray-07-alpha, --ls-guideline-color, #ddd) !important;
+  border-left-color: or(--logseq-og-guideline-color, --lx-gray-04-alpha, --ls-guideline-color, #ddd) !important;
 
   padding-top: 2px;
   padding-bottom: 3px;
@@ -598,10 +598,11 @@
 
   &:hover > .bullet-container .bullet {
     transform: scale(1.4);
+    background-color: or(--lx-gray-08, inherit) !important;
   }
 
   &:hover > .bullet-container:not(.typed-list) {
-    background-color: var(--ls-block-bullet-border-color, #ced9e0);
+    background-color: or(--lx-gray-04-alpha, --ls-block-bullet-border-color, #ced9e0);
   }
 }
 

diff --git a/src/main/frontend/components/container.css b/src/main/frontend/components/container.css
@@ -591,7 +591,7 @@ html[data-theme='dark'] {
     &:hover,
     &:focus,
     &:active {
-      background-color: var(--ls-active-primary-color);
+      background-color: or(--lx-gray-08-alpha, --ls-active-primary-color);
     }
   }
 

diff --git a/src/main/frontend/components/repo.cljs b/src/main/frontend/components/repo.cljs
@@ -226,7 +226,8 @@
                                               (if (ui/tabler-icon icon) icon "user"))
                                             "database") {:size (if logged-in? 12 16)
                                                          :id "database-icon"
-                                                         :class (when logged-in? "p-1 rounded color-level-5")})]
+                                                         :class (when logged-in? "p-1 rounded")
+                                                         :style {:background-color "var(--lx-gray-06-alpha, var(--color-level-5))"}})]
                                 [:div.graphs
                                  [:span#repo-switch.block.pr-2.whitespace-nowrap
                                   [:span [:span#repo-name.font-medium