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

🐛 Fix rounded corners on canvas color

Browse source
This commit is contained in:
alonso.torres 2023-11-14 16:45:25 +01:00
parent 78332257aa
commit 6c003a4f24
2 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
frontend/src/app/main/ui/workspace/sidebar/options/rows/color_row.cljs
View file

@ -68,6 +68,12 @@
editing-text* (mf/use-state false) editing-text* (mf/use-state false)
editing-text? (deref editing-text*) editing-text? (deref editing-text*)
opacity?
(and (not gradient-color?)
(not multiple-colors?)
(not library-color?)
(not disable-opacity))
on-focus on-focus
(mf/use-fn (mf/use-fn
(mf/deps on-focus) (mf/deps on-focus)
@ -187,6 +193,7 @@
:ref dref} :ref dref}
[:span {:class (stl/css :color-info)} [:span {:class (stl/css :color-info)}
[:span {:class (stl/css-case :color-name-wrapper true [:span {:class (stl/css-case :color-name-wrapper true
:no-opacity (not opacity?)
:library-name-wrapper library-color? :library-name-wrapper library-color?
:editing editing-text? :editing editing-text?
:gradient-name-wrapper gradient-color?)} :gradient-name-wrapper gradient-color?)}
@ -238,10 +245,7 @@
:on-blur on-blur :on-blur on-blur
:on-change handle-value-change}]])] :on-change handle-value-change}]])]
(when (and (not gradient-color?) (when opacity?
(not multiple-colors?)
(not library-color?))
[:div {:class (stl/css :opacity-element-wrapper)} [:div {:class (stl/css :opacity-element-wrapper)}
[:span {:class (stl/css :icon-text)} [:span {:class (stl/css :icon-text)}
"%"] "%"]
@ -263,14 +267,7 @@
:on-click handle-select} :on-click handle-select}
i/move-refactor])] i/move-refactor])]
;; OLD CSS
[:div.row-flex.color-data {:title title [:div.row-flex.color-data {:title title
:class (dom/classnames :class (dom/classnames
:dnd-over-top (= (:over dprops) :top) :dnd-over-top (= (:over dprops) :top)

3
frontend/src/app/main/ui/workspace/sidebar/options/rows/color_row.scss
View file

@ -24,6 +24,9 @@
border-radius: $br-8 0 0 $br-8; border-radius: $br-8 0 0 $br-8;
padding: 0; padding: 0;
margin-right: 0; margin-right: 0;
&.no-opacity {
border-radius: $br-8;
}
.color-bullet-wrapper { .color-bullet-wrapper {
height: $s-28; height: $s-28;
padding: 0 $s-2 0 $s-8; padding: 0 $s-2 0 $s-8;