From 3cae356f939572ea8cc388135eb9da881cef65ca Mon Sep 17 00:00:00 2001 From: elhombretecla Date: Fri, 12 Feb 2016 16:26:11 +0100 Subject: [PATCH] changes styles for the left sidebar --- resources/public/styles/partials/settings-bar.scss | 5 +++++ resources/public/styles/partials/workspace-canvas.scss | 8 ++++++-- src/uxbox/ui/workspace/sidebar.cljs | 3 +-- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/resources/public/styles/partials/settings-bar.scss b/resources/public/styles/partials/settings-bar.scss index b1287a8a89..9edb595140 100644 --- a/resources/public/styles/partials/settings-bar.scss +++ b/resources/public/styles/partials/settings-bar.scss @@ -5,6 +5,11 @@ position: fixed; right: 0; width: 250px; + z-index: 10; + + &.settings-bar-left { + left: 0 + } .settings-bar-inside { align-items: center; diff --git a/resources/public/styles/partials/workspace-canvas.scss b/resources/public/styles/partials/workspace-canvas.scss index c450fb7f2a..f8c872a459 100644 --- a/resources/public/styles/partials/workspace-canvas.scss +++ b/resources/public/styles/partials/workspace-canvas.scss @@ -1,15 +1,19 @@ .workspace-canvas { box-sizing: border-box; height: calc(100vh - 50px); - margin: 0 250px 0 50px; + margin: 0 250px 0 250px; overflow: scroll; width: 100%; transition: none; - &.no-tool-bar { + &.no-tool-bar-right { margin-right: 0; } + &.no-tool-bar-left { + margin-left: 0; + } + .viewport { &.drawing { cursor: cell; diff --git a/src/uxbox/ui/workspace/sidebar.cljs b/src/uxbox/ui/workspace/sidebar.cljs index c7e1a019c7..c1536fbe4c 100644 --- a/src/uxbox/ui/workspace/sidebar.cljs +++ b/src/uxbox/ui/workspace/sidebar.cljs @@ -42,7 +42,7 @@ [own] (let [toolboxes (rum/react wb/toolboxes-l)] (html - [:aside#settings-bar.settings-bar + [:aside#settings-bar.settings-bar.settings-bar-left [:div.settings-bar-inside (when (contains? toolboxes :draw) (draw-toolbox)) @@ -56,4 +56,3 @@ {:render left-sidebar-render :name "aside" :mixins [rum/reactive mx/static]})) -