diff --git a/src/pinkgorilla/layout/sidebar_tree.cljs b/src/pinkgorilla/layout/sidebar_tree.cljs index c93d559..878e20f 100644 --- a/src/pinkgorilla/layout/sidebar_tree.cljs +++ b/src/pinkgorilla/layout/sidebar_tree.cljs @@ -28,7 +28,4 @@ (into [:ul] (map menu items))]] [:div.sidebar-main - page - ] - - ]) \ No newline at end of file + page]]) \ No newline at end of file diff --git a/src/spaces/layout/fixed.cljs b/src/spaces/layout/fixed.cljs index 80dc4a7..0164cb9 100644 --- a/src/spaces/layout/fixed.cljs +++ b/src/spaces/layout/fixed.cljs @@ -2,7 +2,7 @@ (:require [spaces.core :as spaces])) -(defn main-top [{:keys [height width +(defn main-top [{:keys [height width top top-size top-resizeable top-scrollable main main-scrollable] :or {height "100%" @@ -10,8 +10,7 @@ top-size 50 top-resizeable true top-scrollable false - main-scrollable true - }}] + main-scrollable true}}] ;(println "layout-fixed mt ...") [spaces/fixed {:height height :width width} (if top-resizeable @@ -20,11 +19,10 @@ [spaces/fill {:scrollable main-scrollable} main]]) -(defn left-right-top [{:keys [height width +(defn left-right-top [{:keys [height width top top-size top-resizeable top-scrollable left left-size left-resizeable left-scrollable - right right-scrollable - ] + right right-scrollable] :or {height "100%" width "100%" top-size 50 @@ -33,12 +31,11 @@ left-size "50%" left-resizeable true left-scrollable true - right-scrollable true - }}] + right-scrollable true}}] ;(println "layout-fixed lrt ...") [spaces/fixed {:height height :width width} (if top-resizeable - [spaces/top-resizeable {:size top-size :scrollable top-scrollable } top] + [spaces/top-resizeable {:size top-size :scrollable top-scrollable} top] [spaces/top {:size top-size :scrollable top-scrollable} top]) [spaces/fill (if left-resizeable @@ -52,15 +49,14 @@ middle middle-scrollable] :or {height "100%" width "100%" - + left-size "25%" left-resizeable true left-scrollable true right-size "25%" right-resizeable true right-scrollable true - middle-scrollable true - }}] + middle-scrollable true}}] ;(println "layout-fixed lrm ...") [spaces/fixed {:height height :width width} (if left-resizeable diff --git a/src/spaces/layout/screen.cljs b/src/spaces/layout/screen.cljs index 50c44d0..c2b7d75 100644 --- a/src/spaces/layout/screen.cljs +++ b/src/spaces/layout/screen.cljs @@ -25,8 +25,7 @@ left-size "50%" left-resizeable true left-scrollable true - right-scrollable true - }}] + right-scrollable true}}] ;(println "layout-viewport lrt ...") [spaces/viewport (if top-resizeable @@ -39,16 +38,15 @@ [spaces/fill {:scrollable right-scrollable} right]]]) (defn screen-left-right-middle [{:keys [left left-size left-resizeable left-scrollable - right right-size right-resizeable right-scrollable - middle middle-scrollable ] + right right-size right-resizeable right-scrollable + middle middle-scrollable] :or {left-size "25%" left-resizeable true left-scrollable true right-size "25%" right-resizeable true right-scrollable true - middle-scrollable true - }}] + middle-scrollable true}}] ;(println "layout-viewport lrm ...") [spaces/viewport (if left-resizeable