3pp-mirror/penpot
1
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2025-06-05 04:41:37 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'origin/staging' into develop

Browse source
This commit is contained in:
Alejandro Alonso 2023-09-07 11:32:03 +02:00
commit 1ba76cb3f8
6 changed files with 66 additions and 56 deletions
Download patch file Download diff file Expand all files Collapse all files

6
CHANGES.md
View file

@ -12,6 +12,12 @@
### :heart: Community contributions by (Thank you!) ### :heart: Community contributions by (Thank you!)
## 1.19.4
### :sparkles: New features
- Improve selected colors [Taiga #5805]( https://tree.taiga.io/project/penpot/us/5805)
## 1.19.3 ## 1.19.3
### :sparkles: New features ### :sparkles: New features

2
docker/images/files/nginx.conf
View file

@ -50,6 +50,8 @@ http {
proxy_cache_valid any 48h; proxy_cache_valid any 48h;
proxy_cache_key "$host$request_uri"; proxy_cache_key "$host$request_uri";
include /etc/nginx/overrides.d/*.conf;
server { server {
listen 80 default_server; listen 80 default_server;
server_name _; server_name _;

15
frontend/src/app/main/data/users.cljs
View file

@ -105,9 +105,15 @@
ptk/EffectEvent ptk/EffectEvent
(effect [_ state _] (effect [_ state _]
(when-let [profile (:profile state)] (let [profile (:profile state)
(swap! storage assoc :profile profile) email (:email profile)
(i18n/set-locale! (:lang profile)))))) previous-profile (:profile @storage)
previous-email (:email previous-profile)]
(when profile
(swap! storage assoc :profile profile)
(i18n/set-locale! (:lang profile))
(when (not= previous-email email)
(swap! storage dissoc ::current-team-id)))))))
(defn fetch-profile (defn fetch-profile
[] []
@ -247,9 +253,8 @@
ptk/EffectEvent ptk/EffectEvent
(effect [_ _ _] (effect [_ _ _]
;; We prefer to keek some stuff in the storage like the current-team-id ;; We prefer to keek some stuff in the storage like the current-team-id and the profile
(swap! storage dissoc :redirect-url) (swap! storage dissoc :redirect-url)
(swap! storage dissoc :profile)
(i18n/reset-locale))))) (i18n/reset-locale)))))
(defn logout (defn logout

81
frontend/src/app/main/ui/workspace/sidebar/options/menus/color_selection.cljs
View file

@ -151,8 +151,8 @@
(mf/defc color-selection-menu (mf/defc color-selection-menu
{::mf/wrap [#(mf/memo' % (mf/check-props ["shapes"]))]} {::mf/wrap [#(mf/memo' % (mf/check-props ["shapes"]))]}
[{:keys [shapes file-id shared-libs] :as props}] [{:keys [shapes file-id shared-libs] :as props}]
(let [{:keys [all-colors grouped-colors library-colors colors]} (mf/with-memo [shapes file-id shared-libs] (let [{:keys [ grouped-colors library-colors colors]} (mf/with-memo [shapes file-id shared-libs]
(prepare-colors shapes file-id shared-libs)) (prepare-colors shapes file-id shared-libs))
expand-lib-color (mf/use-state false) expand-lib-color (mf/use-state false)
expand-color (mf/use-state false) expand-color (mf/use-state false)
@ -202,13 +202,26 @@
(mf/with-effect [grouped-colors] (mf/with-effect [grouped-colors]
(reset! grouped-colors* grouped-colors)) (reset! grouped-colors* grouped-colors))
(when (> (count all-colors) 1) [:div.element-set
[:div.element-set [:div.element-set-title
[:div.element-set-title [:span (tr "workspace.options.selection-color")]]
[:span (tr "workspace.options.selection-color")]] [:div.element-set-content
[:div.element-set-content [:div.selected-colors
[:div.selected-colors (for [[index color] (d/enumerate (take 3 library-colors))]
(for [[index color] (d/enumerate (take 3 library-colors))] [:& color-row {:key (dm/str "library-color-" (:color color))
:color color
:index index
:on-detach on-detach
:select-only select-only
:on-change #(on-change %1 color %2)
:on-open on-open
:on-close on-close}])
(when (and (false? @expand-lib-color) (< 3 (count library-colors)))
[:div.expand-colors {:on-click #(reset! expand-lib-color true)}
[:span i/actions]
[:span.text (tr "workspace.options.more-lib-colors")]])
(when @expand-lib-color
(for [[index color] (d/enumerate (drop 3 library-colors))]
[:& color-row {:key (dm/str "library-color-" (:color color)) [:& color-row {:key (dm/str "library-color-" (:color color))
:color color :color color
:index index :index index
@ -216,41 +229,27 @@
:select-only select-only :select-only select-only
:on-change #(on-change %1 color %2) :on-change #(on-change %1 color %2)
:on-open on-open :on-open on-open
:on-close on-close}]) :on-close on-close}]))]
(when (and (false? @expand-lib-color) (< 3 (count library-colors)))
[:div.expand-colors {:on-click #(reset! expand-lib-color true)}
[:span i/actions]
[:span.text (tr "workspace.options.more-lib-colors")]])
(when @expand-lib-color
(for [[index color] (d/enumerate (drop 3 library-colors))]
[:& color-row {:key (dm/str "library-color-" (:color color))
:color color
:index index
:on-detach on-detach
:select-only select-only
:on-change #(on-change %1 color %2)
:on-open on-open
:on-close on-close}]))]
[:div.selected-colors [:div.selected-colors
(for [[index color] (d/enumerate (take 3 colors))] (for [[index color] (d/enumerate (take 3 colors))]
[:& color-row {:key (dm/str "color-" index) [:& color-row {:key (dm/str "color-" index)
:color color
:index index
:select-only select-only
:on-change #(on-change %1 color %2)
:on-open on-open
:on-close on-close}])
(when (and (false? @expand-color) (< 3 (count colors)))
[:div.expand-colors {:on-click #(reset! expand-color true)}
[:span i/actions]
[:span.text (tr "workspace.options.more-colors")]])
(when @expand-color
(for [[index color] (d/enumerate (drop 3 colors))]
[:& color-row {:key (dm/str "color-" (:color color))
:color color :color color
:index index :index index
:select-only select-only :select-only select-only
:on-change #(on-change %1 color %2) :on-change #(on-change %1 color %2)
:on-open on-open :on-open on-open
:on-close on-close}]) :on-close on-close}]))]]]))
(when (and (false? @expand-color) (< 3 (count colors)))
[:div.expand-colors {:on-click #(reset! expand-color true)}
[:span i/actions]
[:span.text (tr "workspace.options.more-colors")]])
(when @expand-color
(for [[index color] (d/enumerate (drop 3 colors))]
[:& color-row {:key (dm/str "color-" (:color color))
:color color
:index index
:select-only select-only
:on-change #(on-change %1 color %2)
:on-open on-open
:on-close on-close}]))]]])))

9
frontend/src/app/main/ui/workspace/sidebar/options/shapes/frame.cljs
View file

@ -93,11 +93,10 @@
[:& stroke-menu {:ids ids [:& stroke-menu {:ids ids
:type type :type type
:values stroke-values}] :values stroke-values}]
(when (> (count objects) 2) [:& color-selection-menu {:type type
[:& color-selection-menu {:type type :shapes (vals objects)
:shapes (vals objects) :file-id file-id
:file-id file-id :shared-libs shared-libs}]
:shared-libs shared-libs}])
[:& shadow-menu {:ids ids [:& shadow-menu {:ids ids
:values (select-keys shape [:shadow])}] :values (select-keys shape [:shadow])}]
[:& blur-menu {:ids ids [:& blur-menu {:ids ids

9
frontend/src/app/main/ui/workspace/sidebar/options/shapes/group.cljs
View file

@ -97,11 +97,10 @@
(when-not (empty? stroke-ids) (when-not (empty? stroke-ids)
[:& stroke-menu {:type type :ids stroke-ids :values stroke-values}]) [:& stroke-menu {:type type :ids stroke-ids :values stroke-values}])
(when (> (count objects) 2) [:& color-selection-menu {:type type
[:& color-selection-menu {:type type :shapes (vals objects)
:shapes (vals objects) :file-id file-id
:file-id file-id :shared-libs shared-libs}]
:shared-libs shared-libs}])
(when-not (empty? shadow-ids) (when-not (empty? shadow-ids)
[:& shadow-menu {:type type :ids shadow-ids :values shadow-values}]) [:& shadow-menu {:type type :ids shadow-ids :values shadow-values}])