Penpot/penpot
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2025-01-22 14:39:45 -05:00
Code Issues Activity

🐛 Remove unused local fonts

Browse source
This commit is contained in:
Andrés Moya 2021-02-24 15:16:16 +01:00 • committed by Andrey Antukh
parent 62784d0708
commit 85781c5b7f
4 changed files with 19 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGES.md
View file

@ -35,6 +35,7 @@
- Fix errors on onboarding file [Taiga #1287](https://tree.taiga.io/project/penpot/issue/1287)
- Fix infinite recursion on logout.
- Fix issues with frame selection [Taiga #1300](https://tree.taiga.io/project/penpot/issue/1300), [Taiga #1255](https://tree.taiga.io/project/penpot/issue/1255)
- Fix local fonts error [#691](https://github.com/penpot/penpot/issues/691)
- Fix problem width handoff code generation [Taiga #1204](https://tree.taiga.io/project/penpot/issue/1204)
- Fix problem with indices refreshing on page changes [#646](https://github.com/penpot/penpot/issues/646)
- Have language change notification written in the new language [Taiga #1205](https://tree.taiga.io/project/penpot/issue/1205)

14
frontend/resources/locales.json
View file

@ -4244,6 +4244,13 @@
},
"unused" : true
},
"workspace.options.text-options.google" : {
"translations" : {
"en" : "Google",
"es" : "Google"
},
"used-in" : [ "src/app/main/ui/workspace/sidebar/options/typography.cljs" ]
},
"workspace.options.text-options.grow-auto-height" : {
"translations" : {
"en" : "Auto height",
@ -4304,6 +4311,13 @@
},
"used-in" : [ "src/app/main/ui/workspace/sidebar/options/text.cljs", "src/app/main/ui/workspace/sidebar/options/typography.cljs" ]
},
"workspace.options.text-options.preset" : {
"translations" : {
"en" : "Preset",
"es" : "Predefinidos"
},
"used-in" : [ "src/app/main/ui/workspace/sidebar/options/typography.cljs" ]
},
"workspace.options.text-options.strikethrough" : {
"translations" : {
"en" : "Strikethrough",

30
frontend/src/app/main/fonts.cljs
View file

@ -41,36 +41,6 @@
{:id "bold" :name "bold" :weight "bold" :style "normal"}
{:id "bolditalic" :name "bold (italic)" :weight "bold" :style "italic"}
{:id "black" :name "black" :weight "900" :style "normal"}
{:id "blackitalic" :name "black (italic)" :weight "900" :style "italic"}]}
{:id "roboto"
:family "roboto"
:name "Roboto"
:variants [{:id "100" :name "100" :weight "100" :style "normal"}
{:id "100italic" :name "100 (italic)" :weight "100" :style "italic"}
{:id "200" :name "200" :weight "200" :style "normal"}
{:id "200italic" :name "200 (italic)" :weight "200" :style "italic"}
{:id "regular" :name "regular" :weight "400" :style "normal"}
{:id "italic" :name "italic" :weight "400" :style "italic"}
{:id "500" :name "500" :weight "500" :style "normal"}
{:id "500italic" :name "500 (italic)" :weight "500" :style "italic"}
{:id "bold" :name "bold" :weight "bold" :style "normal"}
{:id "bolditalic" :name "bold (italic)" :weight "bold" :style "italic"}
{:id "black" :name "black" :weight "900" :style "normal"}
{:id "blackitalic" :name "black (italic)" :weight "900" :style "italic"}]}
{:id "robotocondensed"
:family "robotocondensed"
:name "Roboto Condensed"
:variants [{:id "100" :name "100" :weight "100" :style "normal"}
{:id "100italic" :name "100 (italic)" :weight "100" :style "italic"}
{:id "200" :name "200" :weight "200" :style "normal"}
{:id "200italic" :name "200 (italic)" :weight "200" :style "italic"}
{:id "regular" :name "regular" :weight "400" :style "normal"}
{:id "italic" :name "italic" :weight "400" :style "italic"}
{:id "500" :name "500" :weight "500" :style "normal"}
{:id "500italic" :name "500 (italic)" :weight "500" :style "italic"}
{:id "bold" :name "bold" :weight "bold" :style "normal"}
{:id "bolditalic" :name "bold (italic)" :weight "bold" :style "italic"}
{:id "black" :name "black" :weight "900" :style "normal"}
{:id "blackitalic" :name "black (italic)" :weight "900" :style "italic"}]}])
(defonce fontsdb (l/atom {}))

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

@ -32,14 +32,14 @@
(mf/defc font-select-optgroups
{::mf/wrap [mf/memo]}
[]
[{:keys [locale] :as props}]
[:*
[:optgroup {:label "Local"}
[:optgroup {:label (t locale "workspace.options.text-options.preset")}
(for [font fonts/local-fonts]
[:option {:value (:id font)
:key (:id font)}
(:name font)])]
[:optgroup {:label "Google"}
[:optgroup {:label (t locale "workspace.options.text-options.google")}
(for [font (fonts/resolve-fonts :google)]
[:option {:value (:id font)
:key (:id font)}
@ -97,7 +97,7 @@
:on-change on-font-family-change}
(when (= font-id :multiple)
[:option {:value ""} (t locale "settings.multiple")])
[:& font-select-optgroups]]]
[:& font-select-optgroups {:locale locale}]]]
[:div.row-flex
(let [size-options [8 9 10 11 12 14 18 24 36 48 72]