From 6cdde8444515bf369bca1eed4bb152173bf347e8 Mon Sep 17 00:00:00 2001 From: "alonso.torres" Date: Thu, 4 Feb 2021 14:50:10 +0100 Subject: [PATCH] :bug: Color palette text-wrap and showing when open color palette --- frontend/resources/styles/main/partials/workspace.scss | 8 +++++++- frontend/src/app/main/ui/workspace.cljs | 8 +++++--- frontend/src/app/main/ui/workspace/viewport.cljs | 4 ++-- 3 files changed, 14 insertions(+), 6 deletions(-) diff --git a/frontend/resources/styles/main/partials/workspace.scss b/frontend/resources/styles/main/partials/workspace.scss index e2d3ba7b6..850f34b0f 100644 --- a/frontend/resources/styles/main/partials/workspace.scss +++ b/frontend/resources/styles/main/partials/workspace.scss @@ -99,8 +99,14 @@ position: fixed; right: calc(#{$width-settings-bar} + 10px); text-align: center; - width: 110px; + width: 125px; + white-space: nowrap; padding-bottom: 2px; + transition: bottom 0.5s; + + &.color-palette-open { + bottom: 5rem; + } span { color: $color-white; diff --git a/frontend/src/app/main/ui/workspace.cljs b/frontend/src/app/main/ui/workspace.cljs index 8c054e9a4..a8eb93cde 100644 --- a/frontend/src/app/main/ui/workspace.cljs +++ b/frontend/src/app/main/ui/workspace.cljs @@ -46,7 +46,8 @@ [props] (let [zoom (or (obj/get props "zoom") 1) vbox (obj/get props "vbox") - vport (obj/get props "vport")] + vport (obj/get props "vport") + colorpalette? (obj/get props "colorpalette?")] [:* [:div.empty-rule-square] @@ -56,7 +57,7 @@ [:& vertical-rule {:zoom zoom :vbox vbox :vport vport}] - [:& coordinates]])) + [:& coordinates {:colorpalette? colorpalette?}]])) (mf/defc workspace-content {::mf/wrap-props false} @@ -76,7 +77,8 @@ (when (contains? layout :rules) [:& workspace-rules {:zoom zoom :vbox vbox - :vport vport}]) + :vport vport + :colorpalette? (contains? layout :colorpalette)}]) [:& viewport-actions] [:& viewport {:file file diff --git a/frontend/src/app/main/ui/workspace/viewport.cljs b/frontend/src/app/main/ui/workspace/viewport.cljs index 4bc17fc84..d6deeb4c9 100644 --- a/frontend/src/app/main/ui/workspace/viewport.cljs +++ b/frontend/src/app/main/ui/workspace/viewport.cljs @@ -81,9 +81,9 @@ ;; --- Coordinates Widget (mf/defc coordinates - [] + [{:keys [colorpalette?]}] (let [coords (hooks/use-rxsub ms/mouse-position)] - [:ul.coordinates + [:ul.coordinates {:class (when colorpalette? "color-palette-open")} [:span {:alt "x"} (str "X: " (:x coords "-"))] [:span {:alt "y"}