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

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

Browse source
This commit is contained in:
Andrey Antukh 2024-07-25 11:23:42 +02:00
commit 025034cb71
21 changed files with 190 additions and 155 deletions
Download patch file Download diff file Expand all files Collapse all files

14
frontend/src/app/main/data/dashboard.cljs
View file

@ -299,19 +299,7 @@
(ptk/reify ::libraries-fetched
ptk/UpdateEvent
(update [_ state]
(let [templates-a-b-test? (cf/external-feature-flag "dashboard-01" "test")
remove-ids (if templates-a-b-test?
#{"wireframing-kit" "prototype-examples" "plants-app" "penpot-design-system"}
#{"prototype-examples" "penpot-design-system"})
libraries (cond->> libraries
:always
(remove #(contains? remove-ids (:id %)))
templates-a-b-test?
(concat [{:id "wireframing-kit", :name "Wireframe library"}
{:id "prototype-examples", :name "Prototype template"}
{:id "plants-app", :name "UI mockup example"}
{:id "penpot-design-system", :name "Design system example"}]))]
(assoc state :builtin-templates libraries)))))
(assoc state :builtin-templates libraries))))
(defn fetch-builtin-templates
[]

6
frontend/src/app/main/ui/onboarding/questions.cljs
View file

@ -403,9 +403,9 @@
(mf/with-memo []
(-> (shuffle [{:label (tr "labels.youtube") :value "youtube"}
{:label (tr "labels.event") :value "event"}
{:label (tr "labels.search") :value "search"}
{:label (tr "labels.social") :value "social"}
{:label (tr "labels.article") :value "article"}])
{:label (tr "onboarding.questions.referer.search") :value "search"}
{:label (tr "onboarding.questions.referer.social") :value "social"}
{:label (tr "onboarding.questions.referer.article") :value "article"}])
(conj {:label (tr "labels.other-short") :value "other"})))
current-referer

6
frontend/src/app/main/ui/workspace/sidebar/assets/colors.cljs
View file

@ -264,8 +264,10 @@
multi-colors? multi-assets? on-asset-click on-assets-delete
on-clear-selection on-group on-rename-group on-ungroup colors
selected-full]}]
(let [group-open? (or ^boolean force-open?
^boolean (get open-groups prefix (if (= prefix "") true false)))
(let [group-open? (if (false? (get open-groups prefix)) ;; if the user has closed it specifically, respect that
false
(or ^boolean force-open?
^boolean (get open-groups prefix (if (= prefix "") true false))))
dragging* (mf/use-state false)
dragging? (deref dragging*)

4
frontend/src/app/main/ui/workspace/sidebar/assets/typographies.cljs
View file

@ -128,7 +128,9 @@
[{:keys [file-id prefix groups open-groups force-open? file local? selected local-data
editing-id renaming-id on-asset-click handle-change apply-typography on-rename-group
on-ungroup on-context-menu selected-full]}]
(let [group-open? (get open-groups prefix true)
(let [group-open? (if (false? (get open-groups prefix)) ;; if the user has closed it specifically, respect that
false
(get open-groups prefix true))
dragging* (mf/use-state false)
dragging? (deref dragging*)
selected-paths (mf/with-memo [selected-full]

6
frontend/translations/en.po
View file

@ -2581,15 +2581,15 @@ msgid "labels.event"
msgstr "Event"
#: src/app/main/ui/onboarding/questions.cljs
msgid "labels.search"
msgid "onboarding.questions.referer.search"
msgstr "Search Engine (Google, Yahoo, Bing)"
#: src/app/main/ui/onboarding/questions.cljs
msgid "labels.social"
msgid "onboarding.questions.referer.social"
msgstr "Social Media (X, Linkedin, FB, etc)"
#: src/app/main/ui/onboarding/questions.cljs
msgid "labels.article"
msgid "onboarding.questions.referer.article"
msgstr "Article (Blog, Post, Newsletter)"
#: src/app/main/ui/onboarding/questions.cljs