Styling improvements

This commit is contained in:
Daniel Compton 2018-01-08 11:52:54 +13:00
parent 9855558815
commit b324d62c4e
3 changed files with 96 additions and 10 deletions

View File

@ -315,15 +315,15 @@
:flex "1 1 auto"}] :flex "1 1 auto"}]
[:.panel-content-top {} [:.panel-content-top {}
[:.bm-title-text {:color common/navbar-text-color}] [:.bm-title-text {:color common/navbar-text-color}]
[:button {:width "81px" [:button {:width "81px"
:height "31px" :height "31px"
:font-weight 700 :font-weight 700
:font-size "14px" :font-size "14px"
:cursor "pointer" :cursor "pointer"
:text-align "center" :text-align "center"
:padding "0 5px" :padding "0 5px"
:margin "0 5px"}]] :margin "0 5px"}]]
[:.panel-content-tabs {:margin-left common/gs-19}] [:.panel-content-tabs {:background-color common/white-background-color :padding-left common/gs-19}]
[:.panel-content-scrollable panel-mixin] [:.panel-content-scrollable panel-mixin]
[:.epoch-panel panel-mixin] [:.epoch-panel panel-mixin]
[:.tab-contents {:display "flex" [:.tab-contents {:display "flex"
@ -341,6 +341,27 @@
:margin "5px" :margin "5px"
:opacity "0.3"}] :opacity "0.3"}]
[:.active {:opacity 1}] [:.active {:opacity 1}]
[:.app-db-path
{:border [[(px 1) "solid" common/white-background-border-color]]
:background-color common/white-background-color}]
[:.app-db-path--header
{:background-color "#48494A" ; Name this navbar tint-lighter
:color "white"
:height common/gs-31}]
[:.app-db-path--label
{:color "#2D9CDB"
:font-variant "small-caps"
:text-transform "lowercase"
:height common/gs-19}]
[:.app-db-path--path-header
{:background-color common/white-background-color
:color "#48494A"
:margin "3px"}]
[:.app-db-path--path-text__empty
{:font-style "italic"}]
[:.re-frame-trace--object [:.re-frame-trace--object
[:.toggle {:color text-color-muted [:.toggle {:color text-color-muted
:cursor "pointer" :cursor "pointer"

View File

@ -6,7 +6,8 @@
[day8.re-frame.trace.utils.re-com :as re-com] [day8.re-frame.trace.utils.re-com :as re-com]
[mranderson047.re-frame.v0v10v2.re-frame.core :as rf] [mranderson047.re-frame.v0v10v2.re-frame.core :as rf]
[mranderson047.reagent.v0v6v0.reagent.core :as r] [mranderson047.reagent.v0v6v0.reagent.core :as r]
[day8.re-frame.trace.utils.re-com :as rc]) [day8.re-frame.trace.utils.re-com :as rc]
[day8.re-frame.trace.common-styles :as common])
(:require-macros [day8.re-frame.trace.utils.macros :as macros])) (:require-macros [day8.re-frame.trace.utils.macros :as macros]))
(def delete (macros/slurp-macro "day8/re_frame/trace/images/delete.svg")) (def delete (macros/slurp-macro "day8/re_frame/trace/images/delete.svg"))
@ -15,8 +16,72 @@
(def snapshot (macros/slurp-macro "day8/re_frame/trace/images/snapshot.svg")) (def snapshot (macros/slurp-macro "day8/re_frame/trace/images/snapshot.svg"))
(def snapshot-ready (macros/slurp-macro "day8/re_frame/trace/images/snapshot-ready.svg")) (def snapshot-ready (macros/slurp-macro "day8/re_frame/trace/images/snapshot-ready.svg"))
(defn top-buttons []
[rc/h-box
:justify :between
:children [[:button "+ path viewer"]
[rc/h-box
:align :center
:children
[[rc/label :label "reset app-db to:"]
[:button "initial state"]
[rc/v-box
:width common/gs-81s
:align :center
:children [[rc/label :label "event"]
;; TODO: arrow doesn't show up when there is an alignment
[rc/line]
[rc/label :label "processing"]]]
[:button "end state"]]]]])
(defn path-header [p]
[rc/h-box
:class "app-db-path--header"
:align :center
:gap common/gs-12s
:children [">"
[rc/h-box
:size "auto"
:class "app-db-path--path-header"
:children
[[rc/label
:class (str "app-db-path--path-text " (when (nil? p) "app-db-path--path-text__empty"))
:label (if (some? p)
(prn-str p)
"Showing all of app-db. Try entering a path like [:todos 1]")]]]
[:button "diff"]
[:button "trash"]]])
(defn app-db-path [p]
^{:key (str p)}
[rc/v-box
:class "app-db-path"
:children
[[path-header p]
[rc/label :label "Main data"]
;; TODO: Make these into hyperlinks
[rc/label :class "app-db-path--label" :label "Only Before:"]
[rc/label :label "Before diff"]
[rc/label :class "app-db-path--label" :label "Only After"]
[rc/label :label "After diff"]]])
(defn paths []
[rc/v-box
:gap common/gs-31s
:children
(doall (for [p [["x" "y"] [:abc 123] nil]]
[app-db-path p]))])
(defn render-state [data] (defn render-state [data]
[rc/v-box
:gap common/gs-31s
:children
[[top-buttons]
[paths]]])
(defn old-render-state [data]
(let [subtree-input (r/atom "") (let [subtree-input (r/atom "")
subtree-paths (rf/subscribe [:app-db/paths]) subtree-paths (rf/subscribe [:app-db/paths])
search-string (rf/subscribe [:app-db/search-string]) search-string (rf/subscribe [:app-db/search-string])

View File

@ -115,7 +115,7 @@
(tab-button :views "Views") (tab-button :views "Views")
(tab-button :traces "Trace")]] (tab-button :traces "Trace")]]
]]) ]])
[rc/line :style outer-margins] [rc/line :color "#EEEEEE"]
(when (and external-window? @unloading?) (when (and external-window? @unloading?)
[:h1.host-closed "Host window has closed. Reopen external window to continue tracing."]) [:h1.host-closed "Host window has closed. Reopen external window to continue tracing."])
(when-not (re-frame.trace/is-trace-enabled?) (when-not (re-frame.trace/is-trace-enabled?)