diff --git a/resources/public/styles/partials/workspace-canvas.scss b/resources/public/styles/partials/workspace-canvas.scss index f8c872a45..bb99ee8ec 100644 --- a/resources/public/styles/partials/workspace-canvas.scss +++ b/resources/public/styles/partials/workspace-canvas.scss @@ -5,6 +5,7 @@ overflow: scroll; width: 100%; transition: none; + position: relative; &.no-tool-bar-right { margin-right: 0; diff --git a/src/uxbox/ui/workspace.cljs b/src/uxbox/ui/workspace.cljs index 9b6a7c2fe..154443e5d 100644 --- a/src/uxbox/ui/workspace.cljs +++ b/src/uxbox/ui/workspace.cljs @@ -72,12 +72,12 @@ ;; Pages management lightbox ;; (pagesmngr) - ;; Rules - (h-rule left-sidebar?) - (v-rule left-sidebar?) - ;; Canvas [:section.workspace-canvas {:class classes :on-scroll on-scroll} + ;; Rules + (h-rule left-sidebar?) + (v-rule left-sidebar?) + (when (and (:selected workspace) (= (count (:selected workspace)) 1)) (let [shape-id (first (:selected workspace)) diff --git a/src/uxbox/ui/workspace/rules.cljs b/src/uxbox/ui/workspace/rules.cljs index e2e6361cc..8e6e00f62 100644 --- a/src/uxbox/ui/workspace/rules.cljs +++ b/src/uxbox/ui/workspace/rules.cljs @@ -95,13 +95,11 @@ [own sidebar?] (let [width wb/viewport-width ticks (concat (range (- step-padding start-width) 0 step-size) - (range 0 (- width start-width step-padding) step-size)) - padding (if sidebar? 250 0)] + (range 0 (- width start-width step-padding) step-size))] (html [:svg.horizontal-rule {:width 3000 - :height 3000 - :style {:left (str padding "px")}} + :height 3000} [:g [:rect {:x step-padding :y 0 :width width :height step-padding :fill "#bab7b7"}] [:rect {:x 0 :y 0 :width step-padding :height step-padding :fill "#bab7b7"}]] @@ -120,15 +118,11 @@ [own sidebar?] (let [height wb/viewport-height ticks (concat (range (- step-padding start-height) 0 step-size) - (range 0 (- height start-height step-padding) step-size)) - padding (if sidebar? - 250 - 0)] + (range 0 (- height start-height step-padding) step-size))] (html [:svg.vertical-rule {:width 3000 - :height 3000 - :style {:left (str padding "px")}} + :height 3000} [:g [:rect {:x 0 :y step-padding :height height :width step-padding :fill "#bab7b7"}] (for [tick ticks