Penpot/penpot
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2025-01-25 07:58:49 -05:00
Code Issues Activity

Merge branch 'akshay-gupta7-akshayg7-set-line-height-to-auto' into develop

Browse source
This commit is contained in:
Alejandro Alonso 2023-05-04 12:34:28 +02:00
commit b90aef4e1d
2 changed files with 5 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGES.md
View file

@ -17,6 +17,7 @@
- Update Typography palette order (by @akshay-gupta7) [Github #3156](https://github.com/penpot/penpot/pull/3156) - Update Typography palette order (by @akshay-gupta7) [Github #3156](https://github.com/penpot/penpot/pull/3156)
- Palettes (color, typographies) empty state (by @akshay-gupta7) [Github #3160](https://github.com/penpot/penpot/pull/3160) - Palettes (color, typographies) empty state (by @akshay-gupta7) [Github #3160](https://github.com/penpot/penpot/pull/3160)
- Duplicate objects via drag + alt (by @akshay-gupta7) [Github #3147](https://github.com/penpot/penpot/pull/3147) - Duplicate objects via drag + alt (by @akshay-gupta7) [Github #3147](https://github.com/penpot/penpot/pull/3147)
-Set line-height to auto as 1.2 (by @akshay-gupta7) [Github #3185](https://github.com/penpot/penpot/pull/3185)
## 1.18.3 (Unreleased) ## 1.18.3 (Unreleased)

4
frontend/src/app/main/ui/workspace/sidebar/options/menus/typography.cljs
View file

@ -374,6 +374,8 @@
line-height (or line-height "1.2") line-height (or line-height "1.2")
letter-spacing (or letter-spacing "0") letter-spacing (or letter-spacing "0")
line-height-nillable (if (= (str line-height) "1.2") false true)
handle-change handle-change
(fn [value attr] (fn [value attr]
(on-change {attr (str value)}))] (on-change {attr (str value)}))]
@ -387,8 +389,10 @@
{:min -200 {:min -200
:max 200 :max 200
:step 0.1 :step 0.1
:default "1.2"
:value (attr->string line-height) :value (attr->string line-height)
:placeholder (tr "settings.multiple") :placeholder (tr "settings.multiple")
:nillable line-height-nillable
:on-change #(handle-change % :line-height) :on-change #(handle-change % :line-height)
:on-blur on-blur}]] :on-blur on-blur}]]