Penpot/penpot
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2025-04-01 01:21:21 -05:00
Code Issues Activity

🐛 Color palette text-wrap and showing when open color palette

Browse source
This commit is contained in:
alonso.torres 2021-02-04 14:50:10 +01:00 • committed by Andrey Antukh
parent afa35379b2
commit 6cdde84445
3 changed files with 14 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
frontend/resources/styles/main/partials/workspace.scss
View file

@ -99,8 +99,14 @@
position: fixed; position: fixed;
right: calc(#{$width-settings-bar} + 10px); right: calc(#{$width-settings-bar} + 10px);
text-align: center; text-align: center;
width: 110px; width: 125px;
white-space: nowrap;
padding-bottom: 2px; padding-bottom: 2px;
transition: bottom 0.5s;
&.color-palette-open {
bottom: 5rem;
}
span { span {
color: $color-white; color: $color-white;

8
frontend/src/app/main/ui/workspace.cljs
View file

@ -46,7 +46,8 @@
[props] [props]
(let [zoom (or (obj/get props "zoom") 1) (let [zoom (or (obj/get props "zoom") 1)
vbox (obj/get props "vbox") vbox (obj/get props "vbox")
vport (obj/get props "vport")] vport (obj/get props "vport")
colorpalette? (obj/get props "colorpalette?")]
[:* [:*
[:div.empty-rule-square] [:div.empty-rule-square]
@ -56,7 +57,7 @@
[:& vertical-rule {:zoom zoom [:& vertical-rule {:zoom zoom
:vbox vbox :vbox vbox
:vport vport}] :vport vport}]
[:& coordinates]])) [:& coordinates {:colorpalette? colorpalette?}]]))
(mf/defc workspace-content (mf/defc workspace-content
{::mf/wrap-props false} {::mf/wrap-props false}
@ -76,7 +77,8 @@
(when (contains? layout :rules) (when (contains? layout :rules)
[:& workspace-rules {:zoom zoom [:& workspace-rules {:zoom zoom
:vbox vbox :vbox vbox
:vport vport}]) :vport vport
:colorpalette? (contains? layout :colorpalette)}])
[:& viewport-actions] [:& viewport-actions]
[:& viewport {:file file [:& viewport {:file file

4
frontend/src/app/main/ui/workspace/viewport.cljs
View file

@ -81,9 +81,9 @@
;; --- Coordinates Widget ;; --- Coordinates Widget
(mf/defc coordinates (mf/defc coordinates
[] [{:keys [colorpalette?]}]
(let [coords (hooks/use-rxsub ms/mouse-position)] (let [coords (hooks/use-rxsub ms/mouse-position)]
[:ul.coordinates [:ul.coordinates {:class (when colorpalette? "color-palette-open")}
[:span {:alt "x"} [:span {:alt "x"}
(str "X: " (:x coords "-"))] (str "X: " (:x coords "-"))]
[:span {:alt "y"} [:span {:alt "y"}