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

Merge branch 'akshay-gupta7-akshayg7-empty-state-for-color-typographies' into develop

Browse source
This commit is contained in:
Alejandro Alonso 2023-04-26 12:36:39 +02:00
commit 47cb228e30
5 changed files with 40 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
CHANGES.md
View file

@ -15,8 +15,8 @@
### :heart: Community contributions by (Thank you!)
- Update Typography palette order (by @akshay-gupta7) [Github #3156](https://github.com/penpot/penpot/pull/3156)
- Duplicate objects via drag + alt [Github #3147](https://github.com/penpot/penpot/pull/3147)
- Palettes (color, typographies) empty state (by @akshay-gupta7) [Github #3160](https://github.com/penpot/penpot/pull/3160)
- Duplicate objects via drag + alt (by @akshay-gupta7) [Github #3147](https://github.com/penpot/penpot/pull/3147)
## 1.18.3 (Unreleased)

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

@ -160,10 +160,16 @@
[:span.left-arrow {:on-click on-left-arrow-click} i/arrow-slide]
[:div.color-palette-content {:ref container :on-wheel on-scroll}
[:div.color-palette-inside {:style {:position "relative"
(if (empty? current-colors)
[:div.color-palette-empty {:style {:position "absolute"
:left "50%"
:top "50%"
:transform "translate(-50%, -50%)"}}
(tr "workspace.libraries.colors.empty-palette")]
[:div.color-palette-inside {:style {:position "relative"
:right (str (* 66 offset) "px")}}
(for [[idx item] (map-indexed vector current-colors)]
[:& palette-item {:color item :key idx}])]]
(for [[idx item] (map-indexed vector current-colors)]
[:& palette-item {:color item :key idx}])])]
[:span.right-arrow {:on-click on-right-arrow-click} i/arrow-slide]]))

20
frontend/src/app/main/ui/workspace/textpalette.cljs
View file

@ -129,13 +129,19 @@
[:span.left-arrow {:on-click on-left-arrow-click} i/arrow-slide]
[:div.color-palette-content {:ref container :on-wheel on-wheel}
[:div.color-palette-inside
(for [[idx item] (map-indexed vector current-typographies)]
[:& typography-item
{:key idx
:file-id file-id
:selected-ids selected-ids
:typography item}])]]
(if (empty? current-typographies)
[:div.color-palette-empty {:style {:position "absolute"
:left "50%"
:top "50%"
:transform "translate(-50%, -50%)"}}
(tr "workspace.libraries.colors.empty-typography-palette")]
[:div.color-palette-inside
(for [[idx item] (map-indexed vector current-typographies)]
[:& typography-item
{:key idx
:file-id file-id
:selected-ids selected-ids
:typography item}])])]
[:span.right-arrow {:on-click on-right-arrow-click} i/arrow-slide]]))

8
frontend/translations/en.po
View file

@ -3141,6 +3141,14 @@ msgstr "HSV"
msgid "workspace.libraries.colors.recent-colors"
msgstr "Recent colors"
#: src/app/main/ui/workspace/colorpalette.cljs
msgid "workspace.libraries.colors.empty-palette"
msgstr "There are no Color Styles in your Library yet"
#: src/app/main/ui/workspace/textpalette.cljs
msgid "workspace.libraries.colors.empty-typography-palette"
msgstr "There are no Typography Styles in your Library yet"
#: src/app/main/ui/workspace/colorpicker.cljs
msgid "workspace.libraries.colors.rgb-complementary"
msgstr "RGB Complementary"

8
frontend/translations/es.po
View file

@ -3235,6 +3235,14 @@ msgstr "HSV"
msgid "workspace.libraries.colors.recent-colors"
msgstr "Colores recientes"
#: src/app/main/ui/workspace/colorpalette.cljs
msgid "workspace.libraries.colors.empty-palette"
msgstr "Todavía no hay estilos de color en tu biblioteca"
#: src/app/main/ui/workspace/textpalette.cljs
msgid "workspace.libraries.colors.empty-typography-palette"
msgstr "Todavía no hay tipografías en tu biblioteca"
#: src/app/main/ui/workspace/colorpicker.cljs
msgid "workspace.libraries.colors.rgb-complementary"
msgstr "RGB Complementario"