mirror of
https://github.com/penpot/penpot.git
synced 2025-06-02 16:21:38 +02:00
Merge remote-tracking branch 'origin/staging' into develop
This commit is contained in:
commit
cf62b083fe
4 changed files with 12 additions and 11 deletions
|
@ -144,18 +144,12 @@
|
|||
(map-indexed vector)
|
||||
(filter #(#{(:id group)} (second %)))
|
||||
(ffirst)
|
||||
inc)
|
||||
|
||||
;; Shapes that are in a component (including root) must be detached,
|
||||
;; because cannot be easyly synchronized back to the main component.
|
||||
shapes-to-detach (filter ctk/in-component-copy?
|
||||
(cfh/get-children-with-self objects (:id group)))]
|
||||
inc)]
|
||||
|
||||
(-> (pcb/empty-changes it page-id)
|
||||
(pcb/with-objects objects)
|
||||
(pcb/change-parent parent-id children index-in-parent)
|
||||
(pcb/remove-objects [(:id group)])
|
||||
(pcb/update-shapes (map :id shapes-to-detach) ctk/detach-shape))))
|
||||
(pcb/remove-objects [(:id group)]))))
|
||||
|
||||
(defn remove-frame-changes
|
||||
[it page-id frame objects]
|
||||
|
|
|
@ -133,7 +133,10 @@
|
|||
(defn- fetch-gfont-css
|
||||
[url]
|
||||
(->> (http/send! {:method :get :uri url :mode :cors :response-type :text})
|
||||
(rx/map :body)))
|
||||
(rx/map :body)
|
||||
(rx/catch (fn [err]
|
||||
(.warn js/console "Cannot find the font" (obj/get err "message"))
|
||||
(rx/empty)))))
|
||||
|
||||
(defmethod load-font :google
|
||||
[{:keys [id ::on-loaded] :as font}]
|
||||
|
|
|
@ -332,7 +332,7 @@
|
|||
:title (tr "viewer.header.comments-section" (sc/get-tooltip :open-comments))}
|
||||
i/comments])
|
||||
|
||||
(when (or (= (:type permissions) :membership)
|
||||
(when (or (:in-team permissions)
|
||||
(and (= (:type permissions) :share-link)
|
||||
(= (:who-inspect permissions) "all")))
|
||||
[:button {:on-click go-to-inspect
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue