diff --git a/project.clj b/project.clj index 53ae417..83fa128 100644 --- a/project.clj +++ b/project.clj @@ -20,5 +20,4 @@ [ring/ring-mock "0.3.0"]] :plugins [[lein-less "1.7.5"]]}} :less {:source-paths ["resources/app/stylesheets"] - :target-path "resources/public/css"} - :hooks [leiningen.less]) + :target-path "resources/public/css"}) diff --git a/resources/app/stylesheets/app.less b/resources/app/stylesheets/app.less index 44676ac..82f243c 100644 --- a/resources/app/stylesheets/app.less +++ b/resources/app/stylesheets/app.less @@ -1,4 +1,6 @@ @ci-color: #ccc; +@accent-color: #efefef; +@border-stack: 1px solid @ci-color; @text-padding-v: .2rem; @text-padding-h: 1rem; @accent-border-width: 1rem; @@ -18,6 +20,10 @@ a:active { text-decoration: underline; } +.thin-border { + border: @border-stack; +} + .grid { display: grid; grid-template-columns: 20% 70% 10%; @@ -27,58 +33,59 @@ a:active { "footer footer footer"; margin: auto; max-width: 900px; - border-top: 1px solid #ccc; -} - -nav { - grid-area: nav; -} - -main { - grid-area: main; -} - -aside { - grid-area: sidebar; -} - -header, footer, main, nav, aside { - border-bottom: 1px solid #ccc; - padding: @text-padding-v @text-padding-h; -} + border-top: ; -header { - grid-area: header; - display: grid; - grid-template-columns: 40% 60%; - align-items: center; - border-left: @accent-border-width solid #ccc; -} + nav { + grid-area: nav; + } -.app-title { - grid-column: 1; - font-size: 1.5rem; -} + main { + grid-area: main; + } -.app-title__hello { - font-size: 1rem; - margin-left: @text-padding-h; - font-weight: normal; - font-style: italic; -} + aside { + grid-area: sidebar; + } -.header-content { - grid-column: 2; -} + footer { + grid-area: footer; + } -.header-content__link { - display: inline-block; - padding: @text-padding-v @text-padding-h / 2; - margin-right: @accent-border-width; -} + header, footer, main, nav, aside { + border-bottom: @border-stack; + padding: @text-padding-v @text-padding-h; + } -footer { - grid-area: footer; + header { + grid-area: header; + display: grid; + grid-template-columns: 40% 60%; + align-items: center; + border-top: @border-stack; + border-left: @accent-border-width solid @ci-color; + + .app-title { + grid-column: 1; + font-size: 1.5rem; + } + + .app-title__hello { + font-size: 1rem; + margin-left: @text-padding-h; + font-weight: normal; + font-style: italic; + } + + .header-content { + grid-column: 2; + } + + .header-content__link { + display: inline-block; + padding: @text-padding-v @text-padding-h / 2; + margin-right: @accent-border-width; + } + } } form { @@ -101,8 +108,34 @@ form { .flash { grid-column: 1/3; - border: 1px solid #ccc; + .thin-border; border-left-width: @accent-border-width; padding: .7rem; } } + +table { + width: 100%; + border-collapse: collapse; + border-spacing: 0; + margin-top: 1rem; + margin-bottom: 1rem; + + td, th { + border-bottom: @border-stack; + padding: @text-padding-v * 2 @text-padding-h / 2h; + } + + thead { + th { + padding: @text-padding-v @text-padding-h; + border-bottom: @accent-border-width / 5 solid @ci-color; + } + } + + tbody { + tr:hover { + background-color: @accent-color; + } + } +} diff --git a/src/wanijo/domain/schema.clj b/src/wanijo/domain/schema.clj index bfca590..89fe948 100644 --- a/src/wanijo/domain/schema.clj +++ b/src/wanijo/domain/schema.clj @@ -11,4 +11,4 @@ RETURN s ORDER BY s.created_at" {:ident ident}) - (map #(:data (get "s"))))) + (map #(:data (get % "s")))))