Penpot/penpot
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2025-02-14 02:58:39 -05:00
Code Issues Activity

🐛 Fix order on color palette

Browse source
This commit is contained in:
alonso.torres 2021-05-24 15:07:16 +02:00 • committed by Andrés Moya
parent 2a67008531
commit 5730769a19
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
CHANGES.md
View file

@ -32,7 +32,7 @@
- Fix problem with fonts that ends with numbers [#940](https://github.com/penpot/penpot/issues/940). - Fix problem with fonts that ends with numbers [#940](https://github.com/penpot/penpot/issues/940).
- Fix problem with imported SVG on editing paths [#971](https://github.com/penpot/penpot/issues/971) - Fix problem with imported SVG on editing paths [#971](https://github.com/penpot/penpot/issues/971)
- Fix problem with color picker positioning - Fix problem with color picker positioning
- Fix order on color palette [#961](https://github.com/penpot/penpot/issues/961)
### :arrow_up: Deps updates ### :arrow_up: Deps updates

5
frontend/src/app/main/ui/workspace/colorpalette.cljs
View file

@ -209,7 +209,7 @@
(into [] (into []
(cond (cond
(= selected :recent) (reverse recent-colors) (= selected :recent) (reverse recent-colors)
(= selected :file) (vals file-colors) (= selected :file) (->> (vals file-colors) (sort-by :name))
:else (library->colors shared-libs selected)))))) :else (library->colors shared-libs selected))))))
(mf/use-effect (mf/use-effect
@ -222,7 +222,8 @@
(mf/deps file-colors) (mf/deps file-colors)
(fn [] (fn []
(when (= selected :file) (when (= selected :file)
(reset! current-library-colors (into [] (vals file-colors)))))) (reset! current-library-colors (into [] (->> (vals file-colors)
(sort-by :name)))))))
[:& palette {:left-sidebar? left-sidebar? [:& palette {:left-sidebar? left-sidebar?
:current-colors @current-library-colors :current-colors @current-library-colors