0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2025-01-22 22:49:01 -05:00

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

This commit is contained in:
Andrey Antukh 2024-10-18 17:19:10 +02:00
commit 1318019ccb
5 changed files with 17 additions and 5 deletions

View file

@ -62,6 +62,7 @@
- Fix percent calculation on grid layout tracks [Github #4688](https://github.com/penpot/penpot/issues/4688) - Fix percent calculation on grid layout tracks [Github #4688](https://github.com/penpot/penpot/issues/4688)
- Fix problem with caps and inner shadows [Github #4517](https://github.com/penpot/penpot/issues/4517) - Fix problem with caps and inner shadows [Github #4517](https://github.com/penpot/penpot/issues/4517)
- Fix problem with horizontal/vertical lines and shadows [Github #4516](https://github.com/penpot/penpot/issues/4516) - Fix problem with horizontal/vertical lines and shadows [Github #4516](https://github.com/penpot/penpot/issues/4516)
- Fix problem with layers overflowing panel [Taiga #9021](https://tree.taiga.io/project/penpot/issue/9021)
## 2.2.1 ## 2.2.1

View file

@ -1988,7 +1988,8 @@
(+ (:position guide) (- (:y new-frame) (:y frame)))) (+ (:position guide) (- (:y new-frame) (:y frame))))
guide {:id guide-id guide {:id guide-id
:frame-id new-id :frame-id new-id
:position position}] :position position
:axis (:axis guide)}]
(pcb/set-guide changes guide-id guide)) (pcb/set-guide changes guide-id guide))
changes)) changes))
changes changes

View file

@ -68,8 +68,8 @@
filter-id-blur (dm/fmt "filter-blur-%" render-id) filter-id-blur (dm/fmt "filter-blur-%" render-id)
filter-id-shadows (dm/fmt "filter-shadow-%" render-id) filter-id-shadows (dm/fmt "filter-shadow-%" render-id)
filter-str-blur (filters/filter-str filter-id-blur shape) filter-str-blur (filters/filter-str filter-id-blur (dissoc shape :shadow))
filter-str-shadows (filters/filter-str filter-id-shadows shape) filter-str-shadows (filters/filter-str filter-id-shadows (dissoc shape :blur))
x (dm/get-prop shape :x) x (dm/get-prop shape :x)
y (dm/get-prop shape :y) y (dm/get-prop shape :y)

View file

@ -29,6 +29,15 @@
(def ^:private close-icon (def ^:private close-icon
(i/icon-xref :close (stl/css :close-icon))) (i/icon-xref :close (stl/css :close-icon)))
(defn icon-url
"Creates an sanitizes de icon URL to display"
[host icon]
(dm/str host
(if (and (not (str/ends-with? host "/"))
(not (str/starts-with? icon "/")))
"/" "")
icon))
(mf/defc plugin-entry (mf/defc plugin-entry
[{:keys [index manifest on-open-plugin on-remove-plugin]}] [{:keys [index manifest on-open-plugin on-remove-plugin]}]
@ -49,7 +58,7 @@
[:div {:class (stl/css :plugins-list-element)} [:div {:class (stl/css :plugins-list-element)}
[:div {:class (stl/css :plugin-icon)} [:div {:class (stl/css :plugin-icon)}
[:img {:src (if (some? icon) [:img {:src (if (some? icon)
(dm/str host icon) (icon-url host icon)
(avatars/generate {:name name}))}]] (avatars/generate {:name name}))}]]
[:div {:class (stl/css :plugin-description)} [:div {:class (stl/css :plugin-description)}
[:div {:class (stl/css :plugin-title)} name] [:div {:class (stl/css :plugin-title)} name]
@ -389,7 +398,7 @@
[:div {:class (stl/css :modal-title)} [:div {:class (stl/css :modal-title)}
[:div {:class (stl/css :plugin-icon)} [:div {:class (stl/css :plugin-icon)}
[:img {:src (if (some? icon) [:img {:src (if (some? icon)
(dm/str host icon) (icon-url host icon)
(avatars/generate {:name name}))}]] (avatars/generate {:name name}))}]]
(tr "workspace.plugins.try-out.title" (str/upper (:name plugin)))] (tr "workspace.plugins.try-out.title" (str/upper (:name plugin)))]

View file

@ -32,6 +32,7 @@ $width-settings-bar-max: $s-500;
.layers-tab { .layers-tab {
padding-top: $s-4; padding-top: $s-4;
overflow-x: hidden;
} }
.left-header { .left-header {