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

Merge pull request #5346 from penpot/alotor-fixes-1

Browse source 
Alotor fixes 1
This commit is contained in:
Andrey Antukh 2024-11-25 11:16:25 +01:00 • committed by GitHub
commit 8ee9b45243
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 16 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

9
frontend/src/app/main/ui/shapes/text/styles.cljs
View file

@ -49,11 +49,16 @@
(defn generate-paragraph-styles
[_shape data]
(let [line-height (:line-height data 1.2)
(let [line-height (:line-height data)
line-height
(if (and (some? line-height) (not= "" line-height))
line-height
(:line-height txt/default-text-attrs))
text-align (:text-align data "start")
base #js {;; Fix a problem when exporting HTML
:fontSize 0 ;;(str (:font-size data (:font-size txt/default-text-attrs)) "px")
:lineHeight (:line-height data (:line-height txt/default-text-attrs))
:lineHeight line-height
:margin 0}]
(cond-> base

3
frontend/src/app/main/ui/workspace/sidebar/versions.cljs
View file

@ -134,7 +134,8 @@
time (dt/timeago (:created-at entry) {:locale locale})]
[:span {:class (stl/css :date)} time])]]
[:> icon-button* {:variant "ghost"
[:> icon-button* {:class (stl/css :version-entry-options)
:variant "ghost"
:aria-label (tr "workspace.versions.version-menu")
:on-click handle-open-menu
:icon "menu"}]]