3pp-mirror/penpot
1
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2025-08-07 14:38:33 +02:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source
This commit is contained in:
Alejandro Alonso 2024-04-11 10:21:04 +02:00
commit 5fccc59ad5
5 changed files with 18 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

6
common/src/app/common/types/file.cljc
View file

@ -219,11 +219,11 @@
(defn advance-shape-ref (defn advance-shape-ref
"Get the shape-ref of the near main of the shape, recursively repeated as many times "Get the shape-ref of the near main of the shape, recursively repeated as many times
as the given levels." as the given levels."
[file container libraries shape levels & options] [file container libraries shape levels & {:keys [include-deleted?] :or {include-deleted? false}}]
(let [ref-shape (find-ref-shape file container libraries shape options)] (let [ref-shape (find-ref-shape file container libraries shape :include-deleted? include-deleted? :with-context? true)]
(if (or (nil? (:shape-ref ref-shape)) (not (pos? levels))) (if (or (nil? (:shape-ref ref-shape)) (not (pos? levels)))
(:id ref-shape) (:id ref-shape)
(advance-shape-ref file container libraries ref-shape (dec levels) options)))) (advance-shape-ref file (:container (meta ref-shape)) libraries ref-shape (dec levels) :include-deleted? include-deleted?))))
(defn find-ref-component (defn find-ref-component
"Locate the nearest component in the local file or libraries that is referenced by the "Locate the nearest component in the local file or libraries that is referenced by the

10
frontend/src/app/main/ui/dashboard/projects.cljs
View file

@ -312,11 +312,13 @@
:on-menu-close on-menu-close :on-menu-close on-menu-close
:on-import on-import}] :on-import on-import}]
[:span {:class (stl/css :info)} (str (tr "labels.num-of-files" (i18n/c file-count)))] ;; We group these two spans under a div to avoid having extra space between them.
[:div
[:span {:class (stl/css :info)} (str (tr "labels.num-of-files" (i18n/c file-count)))]
(let [time (-> (:modified-at project) (let [time (-> (:modified-at project)
(dt/timeago {:locale locale}))] (dt/timeago {:locale locale}))]
[:span {:class (stl/css :recent-files-row-title-info)} (str ", " time)]) [:span {:class (stl/css :recent-files-row-title-info)} (str ", " time)])]
[:div {:class (stl/css-case :project-actions true [:div {:class (stl/css-case :project-actions true
:pinned-project (:is-pinned project))} :pinned-project (:is-pinned project))}

2
frontend/src/app/main/ui/shapes/custom_stroke.cljs
View file

@ -91,7 +91,7 @@
color (cond color (cond
(some? gradient) (some? gradient)
(str/ffmt "url(#stroke-color-gradient-%s-%s)" render-id index) (str/ffmt "url(#stroke-color-gradient-%-%)" render-id index)
(some? image) (some? image)
(str/ffmt "url(#stroke-fill-%-%)" render-id index) (str/ffmt "url(#stroke-fill-%-%)" render-id index)

2
frontend/src/app/main/ui/workspace/sidebar/options/menus/component.cljs
View file

@ -184,7 +184,7 @@
:class (stl/css-case :class (stl/css-case
:icon true :icon true
:icon-tick true :icon-tick true
:hidden invalid-text?)} :invalid invalid-text?)}
i/tick] i/tick]
[:div {:class (stl/css :icon :icon-cross) [:div {:class (stl/css :icon :icon-cross)
:title (tr "labels.discard") :title (tr "labels.discard")

7
frontend/src/app/main/ui/workspace/sidebar/options/menus/component.scss
View file

@ -559,6 +559,13 @@
} }
} }
&.icon-tick.invalid:hover {
cursor: default;
svg {
stroke: var(--icon-foreground);
}
}
&.icon-cross:hover, &.icon-cross:hover,
&.icon-trash:hover { &.icon-trash:hover {
svg { svg {