From 379ccefd8b713b97f25f5f96ebd0a1c2071956e2 Mon Sep 17 00:00:00 2001 From: Andrey Antukh Date: Sun, 20 Dec 2015 17:51:36 +0200 Subject: [PATCH] Adapt library bar to colors page. --- frontend/uxbox/ui/dashboard.cljs | 2 +- frontend/uxbox/ui/dashboard/colors.cljs | 28 ++++- frontend/uxbox/ui/library_bar.cljs | 130 ++++++++++++------------ 3 files changed, 93 insertions(+), 67 deletions(-) diff --git a/frontend/uxbox/ui/dashboard.cljs b/frontend/uxbox/ui/dashboard.cljs index aae8a9fb0d..36baba8afa 100644 --- a/frontend/uxbox/ui/dashboard.cljs +++ b/frontend/uxbox/ui/dashboard.cljs @@ -89,7 +89,7 @@ (header) [:section.dashboard-content (colors/menu) - (ui.library-bar/library-bar) + (colors/nav) [:section.dashboard-grid.library (colors/page-title) (colors/grid)]]])) diff --git a/frontend/uxbox/ui/dashboard/colors.cljs b/frontend/uxbox/ui/dashboard/colors.cljs index 0bc765fca7..731fc872c1 100644 --- a/frontend/uxbox/ui/dashboard/colors.cljs +++ b/frontend/uxbox/ui/dashboard/colors.cljs @@ -48,7 +48,33 @@ :mixins [mx/static]})) ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -;; Colors +;; Nav +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; + +(defn nav-render + [own] + (html + [:div.library-bar + [:div.library-bar-inside + [:ul.library-tabs + [:li.current "STANDARD"] + [:li "YOUR LIBRARIES"]] + [:ul.library-elements + #_[:li + [:a.btn-primary {:href "#"} "+ New library"] + ] + [:li + [:span.element-title "Library 1"] + [:span.element-subtitle "21 elements"]]]]])) + +(def ^:static nav + (util/component + {:render nav-render + :name "nav" + :mixins [mx/static]})) + +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; +;; Nav ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; (defn grid-render diff --git a/frontend/uxbox/ui/library_bar.cljs b/frontend/uxbox/ui/library_bar.cljs index c06b074f8f..37c6af5f2a 100644 --- a/frontend/uxbox/ui/library_bar.cljs +++ b/frontend/uxbox/ui/library_bar.cljs @@ -10,73 +10,73 @@ (html [:div.library-bar [:div.library-bar-inside - [:ul.library-tabs - [:li "STANDARD"] - [:li.current "YOUR LIBRARIES"] + [:ul.library-tabs + [:li "STANDARD"] + [:li.current "YOUR LIBRARIES"] ] - [:ul.library-elements - [:li - [:a.btn-primary {:href "#"} "+ New library"] - ] - [:li - [:span.element-title "Library 1"] - [:span.element-subtitle "21 elements"] - ] - [:li - [:span.element-title "Library 2"] - [:span.element-subtitle "21 elements"] - ] - [:li - [:span.element-title "Library 3"] - [:span.element-subtitle "21 elements"] - ] - [:li - [:span.element-title "Library 4"] - [:span.element-subtitle "21 elements"] - ] - [:li - [:span.element-title "Library 5"] - [:span.element-subtitle "21 elements"] - ] - [:li - [:span.element-title "Library 6"] - [:span.element-subtitle "21 elements"] - ] - [:li - [:span.element-title "Library 7"] - [:span.element-subtitle "21 elements"] - ] - [:li - [:span.element-title "Library 8"] - [:span.element-subtitle "21 elements"] - ] - [:li - [:span.element-title "Library 9"] - [:span.element-subtitle "21 elements"] - ] - [:li - [:span.element-title "Library 10"] - [:span.element-subtitle "21 elements"] - ] - [:li - [:span.element-title "Library 11"] - [:span.element-subtitle "21 elements"] - ] - [:li - [:span.element-title "Library 12"] - [:span.element-subtitle "21 elements"] - ] - [:li - [:span.element-title "Library 13"] - [:span.element-subtitle "21 elements"] - ] - [:li - [:span.element-title "Library 14"] - [:span.element-subtitle "21 elements"] - ] + [:ul.library-elements + [:li + [:a.btn-primary {:href "#"} "+ New library"] + ] + [:li + [:span.element-title "Library 1"] + [:span.element-subtitle "21 elements"] + ] + [:li + [:span.element-title "Library 2"] + [:span.element-subtitle "21 elements"] + ] + [:li + [:span.element-title "Library 3"] + [:span.element-subtitle "21 elements"] + ] + [:li + [:span.element-title "Library 4"] + [:span.element-subtitle "21 elements"] + ] + [:li + [:span.element-title "Library 5"] + [:span.element-subtitle "21 elements"] + ] + [:li + [:span.element-title "Library 6"] + [:span.element-subtitle "21 elements"] + ] + [:li + [:span.element-title "Library 7"] + [:span.element-subtitle "21 elements"] + ] + [:li + [:span.element-title "Library 8"] + [:span.element-subtitle "21 elements"] + ] + [:li + [:span.element-title "Library 9"] + [:span.element-subtitle "21 elements"] + ] + [:li + [:span.element-title "Library 10"] + [:span.element-subtitle "21 elements"] + ] + [:li + [:span.element-title "Library 11"] + [:span.element-subtitle "21 elements"] + ] + [:li + [:span.element-title "Library 12"] + [:span.element-subtitle "21 elements"] + ] + [:li + [:span.element-title "Library 13"] + [:span.element-subtitle "21 elements"] + ] + [:li + [:span.element-title "Library 14"] + [:span.element-subtitle "21 elements"] + ] ] - ] - ])) + ] + ])) (def ^:static library-bar (ui/component