mirror of
https://github.com/penpot/penpot.git
synced 2025-07-19 15:17:11 +02:00
Merge pull request #3163 from penpot/niwinz-bugfixes-9
🐛 🔥 Fix merge bugs and remove deprecated code
This commit is contained in:
commit
da54557aab
26 changed files with 114 additions and 1158 deletions
|
@ -101,7 +101,7 @@
|
|||
(fn []
|
||||
(let [features (cond-> #{} components-v2 (conj "components/v2"))]
|
||||
(->> (rx/zip
|
||||
(repo/query! :font-variants {:file-id file-id})
|
||||
(repo/cmd! :get-font-variants {:file-id file-id})
|
||||
(repo/cmd! :get-page {:file-id file-id
|
||||
:page-id page-id
|
||||
:object-id object-id
|
||||
|
@ -141,7 +141,7 @@
|
|||
(fn []
|
||||
(let [features (cond-> #{} components-v2 (conj "components/v2"))]
|
||||
(->> (rx/zip
|
||||
(repo/query! :font-variants {:file-id file-id})
|
||||
(repo/cmd! :get-font-variants {:file-id file-id})
|
||||
(repo/cmd! :get-page {:file-id file-id
|
||||
:page-id page-id
|
||||
:features features}))
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue