refine palette styles

Cirru · Mar 28, 2020 · 5e5f48e · 5e5f48e
1 parent 4f28e7a
commit 5e5f48e
Show file tree

Hide file tree

Showing 4 changed files with 38 additions and 17 deletions.
diff --git a/entry/main.css b/entry/main.css
@@ -16,3 +16,17 @@ body * {
 .is-unremarkable:hover {
   opacity: 1;
 }
+
+::-webkit-scrollbar {
+  width: 1px;
+  height: 1px;
+}
+
+::-webkit-scrollbar-track {
+  background-color: hsla(0,0%,100%,0);
+}
+
+::-webkit-scrollbar-thumb {
+  background-color: hsla(0,0%,100%,0.3);
+}
+
diff --git a/src/app/comp/command.cljs b/src/app/comp/command.cljs
@@ -2,21 +2,23 @@
 (ns app.comp.command
   (:require [clojure.string :as string]
             [respo.core :refer [defcomp div <> span input]]
-            [hsl.core :refer [hsl]]))
-
-(defn on-click [on-select] (fn [e dispatch!] (on-select dispatch!)))
+            [hsl.core :refer [hsl]]
+            [respo.comp.space :refer [=<]]
+            [respo-ui.core :as ui]))
 
 (def style-command
   {:backgroud-color (hsl 0 0 0),
    :padding "0 8px",
-   :line-height 2.4,
-   :font-family "Source Code Pro, Menlo,monospace",
+   :line-height "30px",
+   :font-family ui/font-normal,
    :cursor "pointer"})
 
 (defcomp
  comp-command
  (command selected? on-select)
  (div
-  {:style (merge style-command (if selected? {:background-color (hsl 0 0 30)})),
-   :on-click (on-click on-select)}
-  (<> span (string/join " " command) nil)))
+  {:style (merge style-command (if selected? {:background-color (hsl 0 0 20 0.8)})),
+   :on-click (fn [e dispatch!] (on-select dispatch!))}
+  (case (first command)
+    :defs (div {} (<> (get command 2)) (=< 16 nil) (<> (get command 1) {:color (hsl 0 0 40)}))
+    (<> (string/join " " command) nil))))
diff --git a/src/app/util/detect.cljs b/src/app/util/detect.cljs
@@ -25,7 +25,10 @@
 
 (defn fuzzy-search [pieces queries]
   (every?
-   (fn [query] (some (fn [piece] (string/includes? (str piece) query)) pieces))
+   (fn [query]
+     (some
+      (fn [piece] (string/includes? (str piece) query))
+      (if (= :defs (first pieces)) (subvec pieces 1) pieces)))
    queries))
 
 (defn strip-atom [token]

diff --git a/stack.cirru b/stack.cirru
@@ -86,19 +86,21 @@
       :procs $ []
     |comp.command $ {}
       :ns $ [] |ns |app.comp.command
-        [] |:require ([] |[] |clojure.string |:as |string) ([] |[] |respo.core |:refer $ [] |[] |defcomp |div |<> |span |input) ([] |[] |hsl.core |:refer $ [] |[] |hsl)
+        [] |:require ([] |[] |clojure.string |:as |string) ([] |[] |respo.core |:refer $ [] |[] |defcomp |div |<> |span |input) ([] |[] |hsl.core |:refer $ [] |[] |hsl) ([] |[] |respo.comp.space |:refer $ [] |[] |=<) ([] |[] |respo-ui.core |:as |ui)
       :defs $ {}
         |style-command $ [] |def |style-command
-          [] |{} ([] |:backgroud-color $ [] |hsl |0 |0 |0) ([] |:padding "||0 8px") ([] |:line-height |2.4) ([] |:font-family "||Source Code Pro, Menlo,monospace") ([] |:cursor ||pointer)
-        |on-click $ [] |defn |on-click ([] |on-select)
-          [] |fn ([] |e |dispatch!) ([] |on-select |dispatch!)
+          [] |{} ([] |:backgroud-color $ [] |hsl |0 |0 |0) ([] |:padding "||0 8px") ([] |:line-height "|\"30px") ([] |:font-family |ui/font-normal) ([] |:cursor ||pointer)
         |comp-command $ [] |defcomp |comp-command ([] |command |selected? |on-select)
           [] |div
             [] |{}
               [] |:style $ [] |merge |style-command
-                [] |if |selected? $ [] |{} ([] |:background-color $ [] |hsl |0 |0 |30)
-              [] |:on-click $ [] |on-click |on-select
-            [] |<> |span ([] |string/join "|| " |command) (, |nil)
+                [] |if |selected? $ [] |{} ([] |:background-color $ [] |hsl |0 |0 |20 |0.8)
+              [] |:on-click $ [] |fn ([] |e |dispatch!) ([] |on-select |dispatch!)
+            [] |case ([] |first |command)
+              [] |:defs $ [] |div ([] |{}) ([] |<> $ [] |get |command |2) ([] |=< |16 |nil)
+                [] |<> ([] |get |command |1)
+                  [] |{} $ [] |:color ([] |hsl |0 |0 |40)
+              [] |<> ([] |string/join "|| " |command) (, |nil)
       :procs $ []
     |updater $ {}
       :ns $ [] |ns |app.updater
@@ -1111,7 +1113,7 @@
               [] |some
                 [] |fn ([] |piece)
                   [] |string/includes? ([] |str |piece) (, |query)
-                , |pieces
+                [] |if ([] |= |:defs $ [] |first |pieces) ([] |subvec |pieces |1) (, |pieces)
             , |queries
         |contains-def? $ [] |defn |contains-def? ([] |files |ns-part |name-part) ([] |println "||Contains def:" |ns-part |name-part)
           [] |if ([] |contains? |files |ns-part)