From 9a6b3f55aee664282cf9d838ae1ad52bced9fa33 Mon Sep 17 00:00:00 2001
From: Gregg8 <gregg.ramsey@day8.com.au>
Date: Fri, 19 Jan 2018 16:43:04 +1100
Subject: [PATCH] Increased body text font from 12px to 14px, adjusted checkbox
 so it lines up and improved the input-text styling

---
 src/day8/re_frame/trace/common_styles.cljs |  5 ++++-
 src/day8/re_frame/trace/styles.cljs        | 16 ++++++++++++----
 2 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/src/day8/re_frame/trace/common_styles.cljs b/src/day8/re_frame/trace/common_styles.cljs
index 314d348..67fba2f 100644
--- a/src/day8/re_frame/trace/common_styles.cljs
+++ b/src/day8/re_frame/trace/common_styles.cljs
@@ -218,7 +218,10 @@
 
    ;; input-text - set to 26px high
    [:.rc-input-text
-    [:input {:height "26px"}]]
+    [:input {:height "25px"
+             :border-radius "2px"
+             :background-color "white"
+             :border (str "1px solid " white-background-border-color)}]]
 
    ;; input-time - set to 26px high
    [:.rc-input-time {:height "26px"}]
diff --git a/src/day8/re_frame/trace/styles.cljs b/src/day8/re_frame/trace/styles.cljs
index e7acb7c..b083b50 100644
--- a/src/day8/re_frame/trace/styles.cljs
+++ b/src/day8/re_frame/trace/styles.cljs
@@ -8,7 +8,8 @@
             [day8.re-frame.trace.utils.re-com :as rc]
             [day8.re-frame.trace.view.app-db :as app-db]
             [cljs.spec.alpha :as spec]
-            [day8.re-frame.trace.view.timing :as timing]))
+            [day8.re-frame.trace.view.timing :as timing]
+            [day8.re-frame.trace.view.settings :as settings]))
 
 (def background-gray common/background-gray)
 (def background-gray-hint common/background-gray-hint)
@@ -36,7 +37,7 @@
 
    ;; /*! abridged from normalize.css v7.0.0 | MIT License | github.com/necolas/normalize.css */
    {:line-height "1.15"
-    :font-size   "12px"}
+    :font-size   "14px"}
    [:h1 {:font-size "2em"
          :margin    "0.67em 0"}]
    [:div :nav :h1 :h2 :h3 :h4 :h5 :h6 {:display "block"}]
@@ -74,7 +75,8 @@
     {:-webkit-appearance "button"}]
    [(s/input (s/attr= "type" "checkbox"))
     {:-webkit-appearance "checkbox"
-     :box-sizing         "border-box"}]
+     :box-sizing         "border-box"
+     :margin-top         "3px"}]
 
    [:button:-moz-focusring
     (s/attr= "type" "button")
@@ -425,7 +427,13 @@
    ])
 
 
-(def panel-styles (apply garden/css [css-reset [:#--re-frame-trace-- rc/re-com-css] common/blue-modern re-frame-trace-styles app-db/app-db-styles timing/timing-styles]))
+(def panel-styles (apply garden/css [css-reset
+                                     [:#--re-frame-trace-- rc/re-com-css]
+                                     common/blue-modern
+                                     re-frame-trace-styles
+                                     app-db/app-db-styles
+                                     timing/timing-styles
+                                     settings/settings-styles]))
 ;(def panel-styles (macros/slurp-macro "day8/re_frame/trace/main.css"))