notid/integreat
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mproving layout

Browse Source
This commit is contained in:
Bryce Covert
2019-02-17 08:24:26 -08:00
parent ea7bb1d60f
commit fdcc3192a1
4 changed files with 22 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/cljs/auto_ap/views/components/layouts.cljs
View File

@@ -31,7 +31,7 @@
(let [client (re-frame/subscribe [::subs/client])
clients (re-frame/subscribe [::subs/clients])
menu (re-frame/subscribe [::subs/menu])]
[:nav {:class "navbar has-shadow"}
[:nav {:class "navbar has-shadow is-fixed-top"}
[:div {:class "container"}
[:div {:class "navbar-brand"}
[:a {:class "navbar-item", :href "../"}
@@ -76,22 +76,18 @@
[login-dropdown]]]))
(defn footer []
[:footer {:class "footer"}
[:div {:class "container"}
[:div {:class "content has-text-centered"}
[:p
[:strong "Integreat"]]
[:p
[:a {:class "icon", :href "https://github.com/dansup/bulma-templates"}
[:i {:class "fa fa-github"}]]]]]])
[:footer {:style {:padding "1em"}}
[:div {:class "content has-text-centered"}
[:p
[:strong "Integreat"] ]]])
(defn appearing-side-bar [{:keys [visible?]} & children ]
(let [final-state (reagent/atom visible?)]
(fn [{:keys [visible?]} & children]
[css-transition-group {:in visible? :class-names {:exitDone "bounce animated" :exit "fadeOutRight animated" :enter "fadeInRight animated"} :timeout 300 :onEnter (fn [] (reset! final-state true )) :onExited (fn [] (reset! final-state false))}
(if (or @final-state visible?)
[:aside {:class "column is-4 aside menu hero is-fullheight"}
[:div.sub-main children]]
[:aside {:class "column is-4 aside menu hero is-fullheight" :style {:height "100vh" :overflow "auto"}}
[:div.sub-main {:style {:padding-bottom "80px"}}children ]]
[:div])])))
(defn side-bar-layout [{:keys [side-bar main ap bottom right-side-bar right-side-bar-visible?]}]
@@ -99,15 +95,16 @@
client @(re-frame/subscribe [::subs/client])]
[:div
[navbar ap]
[:div {:class "columns ", :id "mail-app"}
[:aside {:class "column aside menu hero is-2"}
[:div.main.left-nav
side-bar]]
[:div {:class "column messages hero is-fullheight ", :id "message-feed"}
[:div {:class "columns has-shadow", :style {:margin-bottom "0px" :height "100vh"} :id "mail-app" }
[:aside {:class "column aside menu is-2 " }
[:div.main.left-nav
[:div side-bar
]]]
[:div {:class "column messages hero is-fullheight " :style { :overflow "auto" }, :id "message-feed"}
^{:key (str "active-page-" (:name client))}
[:div.inbox-messages main]]
[appearing-side-bar {:visible? right-side-bar-visible?} right-side-bar]]
[footer]
#_[footer]
bottom
[:div#dz-hidden]]))