From 88fe70816528f415bbdfb3a4426aac00bb2ebbbc Mon Sep 17 00:00:00 2001 From: jaywcjlove Date: Fri, 30 Aug 2024 02:49:26 +0000 Subject: [PATCH] v5.1.0 feat: use template engine for styles (#240) 668989eeb53562ba0da42136c34249041fcc27d7 --- CONTRIBUTORS.svg | 24 +- badges.svg | 8 +- coverage-summary.json | 6 +- example/font-class.html | 62 ++-- example/index.html | 68 ++-- example/svgtofont.css | 13 +- example/svgtofont.d.ts | 3 +- example/svgtofont.eot | Bin 8192 -> 8192 bytes example/svgtofont.less | 14 +- example/svgtofont.module.less | 15 +- example/svgtofont.scss | 28 +- example/svgtofont.styl | 25 +- example/svgtofont.ttf | Bin 2292 -> 2292 bytes example/svgtofont.woff | Bin 1568 -> 1572 bytes example/svgtofont.woff2 | Bin 1140 -> 1144 bytes example/symbol.html | 93 ++--- index.html | 8 +- lcov-report/cli.ts.html | 2 +- lcov-report/generate.ts.html | 2 +- lcov-report/index.html | 24 +- lcov-report/index.ts.html | 35 +- lcov-report/log.ts.html | 2 +- lcov-report/utils.ts.html | 163 ++++----- lcov.info | 608 +++++++++++++++----------------- src/website/index.ejs | 163 --------- templates/font-class.html | 62 ++-- templates/index.html | 68 ++-- templates/svgtofont.css | 12 +- templates/svgtofont.eot | Bin 8192 -> 8192 bytes templates/svgtofont.less | 12 +- templates/svgtofont.module.less | 12 +- templates/svgtofont.scss | 12 +- templates/svgtofont.styl | 12 +- templates/svgtofont.ttf | Bin 2068 -> 2068 bytes templates/svgtofont.woff | Bin 1404 -> 1408 bytes templates/svgtofont.woff2 | Bin 988 -> 1020 bytes templates/symbol.html | 81 ++--- 37 files changed, 691 insertions(+), 946 deletions(-) delete mode 100644 src/website/index.ejs diff --git a/CONTRIBUTORS.svg b/CONTRIBUTORS.svg index 3c887568..154822f3 100644 --- a/CONTRIBUTORS.svg +++ b/CONTRIBUTORS.svg @@ -3,7 +3,7 @@ xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="740" - height="52" + height="104" > @@ -14,25 +14,27 @@ - - + + + + - + - + - + - + - + - + - + - + \ No newline at end of file diff --git a/badges.svg b/badges.svg index 8ec82e94..0864a208 100644 --- a/badges.svg +++ b/badges.svg @@ -1,14 +1,14 @@ coverage: 0% - + - - + + - + svgtofont - - - - + - + - + + + + - - - @@ -105,38 +101,42 @@

svgtofont5.1.0

- Converts SVG fonts to TTF/EOT/WOFF/WOFF2/SVG format. +

- GitHub · - - Feedback · - - Font Class Demo · - - Symbol Demo · - - Unicode Demo + + · + + · + + · + + · + + +

- GitHub · - - Feedback · - - Font Class Demo · - - Symbol Demo · - - Unicode Demo + + · + + · + + · + + · + + +

diff --git a/example/index.html b/example/index.html index e1062235..aae589a1 100644 --- a/example/index.html +++ b/example/index.html @@ -4,13 +4,13 @@ svgtofont - - - - + - + + + + - - - @@ -124,38 +120,42 @@

svgtofont5.1.0

- Converts SVG fonts to TTF/EOT/WOFF/WOFF2/SVG format. +

- GitHub · - - Feedback · - - Font Class Demo · - - Symbol Demo · - - Unicode Demo + + · + + · + + · + + · + + +

- GitHub · - - Feedback · - - Font Class Demo · - - Symbol Demo · - - Unicode Demo + + · + + · + + · + + · + + +

diff --git a/example/svgtofont.css b/example/svgtofont.css index d8adaf4d..4dd22fa8 100644 --- a/example/svgtofont.css +++ b/example/svgtofont.css @@ -1,11 +1,11 @@ @font-face { font-family: "svgtofont"; - src: url('svgtofont.eot?t=1724946263238'); /* IE9*/ - src: url('svgtofont.eot?t=1724946263238#iefix') format('embedded-opentype'), /* IE6-IE8 */ - url("svgtofont.woff2?t=1724946263238") format("woff2"), - url("svgtofont.woff?t=1724946263238") format("woff"), - url('svgtofont.ttf?t=1724946263238') format('truetype'), /* chrome, firefox, opera, Safari, Android, iOS 4.2+*/ - url('svgtofont.svg?t=1724946263238#svgtofont') format('svg'); /* iOS 4.1- */ + src: url('svgtofont.eot?t=1724986144989'); /* IE9*/ + src: url('svgtofont.eot?t=1724986144989#iefix') format('embedded-opentype'), /* IE6-IE8 */ + url("svgtofont.woff2?t=1724986144989") format("woff2"), + url("svgtofont.woff?t=1724986144989") format("woff"), + url('svgtofont.ttf?t=1724986144989') format('truetype'), /* chrome, firefox, opera, Safari, Android, iOS 4.2+*/ + url('svgtofont.svg?t=1724986144989#svgtofont') format('svg'); /* iOS 4.1- */ } [class^="svgtofont-"], [class*=" svgtofont-"] { @@ -22,3 +22,4 @@ .svgtofont-left:before { content: "\ea04"; } .svgtofont-stylelint:before { content: "\ea05"; } + diff --git a/example/svgtofont.d.ts b/example/svgtofont.d.ts index 0232482b..2fef4f55 100644 --- a/example/svgtofont.d.ts +++ b/example/svgtofont.d.ts @@ -3,9 +3,8 @@ export enum Svgtofont { Demo = "svgtofont-demo", Git = "svgtofont-git", Left = "svgtofont-left", - Stylelint = "svgtofont-stylelint" + Stylelint = "svgtofont-stylelint", } - export type SvgtofontClassname = "svgtofont-adobe" | "svgtofont-demo" | "svgtofont-git" | "svgtofont-left" | "svgtofont-stylelint" export type SvgtofontIcon = "adobe" | "demo" | "git" | "left" | "stylelint" export const SvgtofontPrefix = "svgtofont-" \ No newline at end of file diff --git a/example/svgtofont.eot b/example/svgtofont.eot index e329e0ccad9b2abc56490ecc7a7d976ce18bee54..473f0b4ca2607b6d73f3adb87b9372daf5f01dcf 100644 GIT binary patch delta 351 zcmZp0XmHqYnvGTBs+U(ifn#=u3#W36%DF_W%E87P&u+0GCvY%K!iX delta 326 zcmZp0XmHqYnvIo#!K1r$^98nxOw96EswW2sPn8xhu8Zfl`O3h}{DJ`p9({Aa4x=}T zd|>Bs;AeUX67bleuxoOFkPUO4vB2bhp?$;}pfY3Q3!uFS5HOEh`F}kF!w#r8h@Q;I zEmAKCRdZl1L__mMHxH1I5)l6f0!ARs0mLwQm_ZqvAnMbBav*Tx>1(isAoUQ?U=N~U m@=!qri-!<(5fGZ6p#mxZF?jMu?o%uZK(m32hRrN;e;5H|B3SDH diff --git a/example/svgtofont.less b/example/svgtofont.less index c051b932..ce3b3bde 100644 --- a/example/svgtofont.less +++ b/example/svgtofont.less @@ -1,10 +1,10 @@ @font-face {font-family: "svgtofont"; - src: url('svgtofont.eot?t=1724946263238'); /* IE9*/ - src: url('svgtofont.eot?t=1724946263238#iefix') format('embedded-opentype'), /* IE6-IE8 */ - url("svgtofont.woff2?t=1724946263238") format("woff2"), - url("svgtofont.woff?t=1724946263238") format("woff"), - url('svgtofont.ttf?t=1724946263238') format('truetype'), /* chrome, firefox, opera, Safari, Android, iOS 4.2+*/ - url('svgtofont.svg?t=1724946263238#svgtofont') format('svg'); /* iOS 4.1- */ + src: url('svgtofont.eot?t=1724986144989'); /* IE9*/ + src: url('svgtofont.eot?t=1724986144989#iefix') format('embedded-opentype'), /* IE6-IE8 */ + url("svgtofont.woff2?t=1724986144989") format("woff2"), + url("svgtofont.woff?t=1724986144989") format("woff"), + url('svgtofont.ttf?t=1724986144989') format('truetype'), /* chrome, firefox, opera, Safari, Android, iOS 4.2+*/ + url('svgtofont.svg?t=1724986144989#svgtofont') format('svg'); /* iOS 4.1- */ } [class^="svgtofont-"], [class*=" svgtofont-"] { @@ -14,8 +14,10 @@ -moz-osx-font-smoothing: grayscale; } + .svgtofont-adobe:before { content: "\ea01"; } .svgtofont-demo:before { content: "\ea02"; } .svgtofont-git:before { content: "\ea03"; } .svgtofont-left:before { content: "\ea04"; } .svgtofont-stylelint:before { content: "\ea05"; } + diff --git a/example/svgtofont.module.less b/example/svgtofont.module.less index 818d6a80..4dad1bc2 100644 --- a/example/svgtofont.module.less +++ b/example/svgtofont.module.less @@ -1,10 +1,10 @@ @font-face {font-family: "svgtofont"; - src: url('svgtofont.eot?t=1724946263238'); /* IE9*/ - src: url('svgtofont.eot?t=1724946263238#iefix') format('embedded-opentype'), /* IE6-IE8 */ - url("svgtofont.woff2?t=1724946263238") format("woff2"), - url("svgtofont.woff?t=1724946263238") format("woff"), - url('svgtofont.ttf?t=1724946263238') format('truetype'), /* chrome, firefox, opera, Safari, Android, iOS 4.2+*/ - url('svgtofont.svg?t=1724946263238#svgtofont') format('svg'); /* iOS 4.1- */ + src: url('svgtofont.eot?t=1724986144989'); /* IE9*/ + src: url('svgtofont.eot?t=1724986144989#iefix') format('embedded-opentype'), /* IE6-IE8 */ + url("svgtofont.woff2?t=1724986144989") format("woff2"), + url("svgtofont.woff?t=1724986144989") format("woff"), + url('svgtofont.ttf?t=1724986144989') format('truetype'), /* chrome, firefox, opera, Safari, Android, iOS 4.2+*/ + url('svgtofont.svg?t=1724986144989#svgtofont') format('svg'); /* iOS 4.1- */ } [class^="svgtofont-"], [class*=" svgtofont-"] { @@ -14,6 +14,7 @@ -moz-osx-font-smoothing: grayscale; } + :global { .svgtofont-adobe:before { content: "\ea01"; } .svgtofont-demo:before { content: "\ea02"; } @@ -21,4 +22,4 @@ .svgtofont-left:before { content: "\ea04"; } .svgtofont-stylelint:before { content: "\ea05"; } -} \ No newline at end of file +} diff --git a/example/svgtofont.scss b/example/svgtofont.scss index 0c20f569..c7665e1e 100644 --- a/example/svgtofont.scss +++ b/example/svgtofont.scss @@ -1,10 +1,10 @@ @font-face {font-family: "svgtofont"; - src: url('svgtofont.eot?t=1724946263238'); /* IE9*/ - src: url('svgtofont.eot?t=1724946263238#iefix') format('embedded-opentype'), /* IE6-IE8 */ - url("svgtofont.woff2?t=1724946263238") format("woff2"), - url("svgtofont.woff?t=1724946263238") format("woff"), - url('svgtofont.ttf?t=1724946263238') format('truetype'), /* chrome, firefox, opera, Safari, Android, iOS 4.2+*/ - url('svgtofont.svg?t=1724946263238#svgtofont') format('svg'); /* iOS 4.1- */ + src: url('svgtofont.eot?t=1724986144989'); /* IE9*/ + src: url('svgtofont.eot?t=1724986144989#iefix') format('embedded-opentype'), /* IE6-IE8 */ + url("svgtofont.woff2?t=1724986144989") format("woff2"), + url("svgtofont.woff?t=1724986144989") format("woff"), + url('svgtofont.ttf?t=1724986144989') format('truetype'), /* chrome, firefox, opera, Safari, Android, iOS 4.2+*/ + url('svgtofont.svg?t=1724986144989#svgtofont') format('svg'); /* iOS 4.1- */ } [class^="svgtofont-"], [class*=" svgtofont-"] { @@ -14,15 +14,21 @@ -moz-osx-font-smoothing: grayscale; } + .svgtofont-adobe:before { content: "\ea01"; } .svgtofont-demo:before { content: "\ea02"; } .svgtofont-git:before { content: "\ea03"; } .svgtofont-left:before { content: "\ea04"; } .svgtofont-stylelint:before { content: "\ea05"; } -$svgtofont-adobe: "\ea01"; -$svgtofont-demo: "\ea02"; -$svgtofont-git: "\ea03"; -$svgtofont-left: "\ea04"; -$svgtofont-stylelint: "\ea05"; + +$adobe: \ea01 + +$demo: \ea02 + +$git: \ea03 + +$left: \ea04 + +$stylelint: \ea05 diff --git a/example/svgtofont.styl b/example/svgtofont.styl index c051b932..bace3040 100644 --- a/example/svgtofont.styl +++ b/example/svgtofont.styl @@ -1,10 +1,10 @@ @font-face {font-family: "svgtofont"; - src: url('svgtofont.eot?t=1724946263238'); /* IE9*/ - src: url('svgtofont.eot?t=1724946263238#iefix') format('embedded-opentype'), /* IE6-IE8 */ - url("svgtofont.woff2?t=1724946263238") format("woff2"), - url("svgtofont.woff?t=1724946263238") format("woff"), - url('svgtofont.ttf?t=1724946263238') format('truetype'), /* chrome, firefox, opera, Safari, Android, iOS 4.2+*/ - url('svgtofont.svg?t=1724946263238#svgtofont') format('svg'); /* iOS 4.1- */ + src: url('svgtofont.eot?t=1724986144989'); /* IE9*/ + src: url('svgtofont.eot?t=1724986144989#iefix') format('embedded-opentype'), /* IE6-IE8 */ + url("svgtofont.woff2?t=1724986144989") format("woff2"), + url("svgtofont.woff?t=1724986144989") format("woff"), + url('svgtofont.ttf?t=1724986144989') format('truetype'), /* chrome, firefox, opera, Safari, Android, iOS 4.2+*/ + url('svgtofont.svg?t=1724986144989#svgtofont') format('svg'); /* iOS 4.1- */ } [class^="svgtofont-"], [class*=" svgtofont-"] { @@ -14,8 +14,21 @@ -moz-osx-font-smoothing: grayscale; } + .svgtofont-adobe:before { content: "\ea01"; } .svgtofont-demo:before { content: "\ea02"; } .svgtofont-git:before { content: "\ea03"; } .svgtofont-left:before { content: "\ea04"; } .svgtofont-stylelint:before { content: "\ea05"; } + + +$adobe = \ea01 + +$demo = \ea02 + +$git = \ea03 + +$left = \ea04 + +$stylelint = \ea05 + diff --git a/example/svgtofont.ttf b/example/svgtofont.ttf index c70596d857f380edd3803a8b81ddb621f8ba05a4..45df41ac5c427bece12afc33493f4f7926c8f54f 100644 GIT binary patch delta 46 vcmew&_(gC+AhRM5@5GR)(!58a;`wd9GH^4$U;u(g-ySc3(VJNqKd=J;c?1yS delta 46 ucmew&_(gC+AhZ0H>WLv!r3H-Z;`wd9GH^4$U;u(g-`uam=*=vQAJ_qqIS}Ij diff --git a/example/svgtofont.woff b/example/svgtofont.woff index 5183e6728d93db5c0f42bcf0a6ad649a7cdd11df..a4e452228d1054f5013d2fd7e3a24bd41927902c 100644 GIT binary patch delta 197 zcmZ3$vxJAI+~3WOfsp|S*iED=Dy91yFp|7VfP$StV= ziUBc$Fc3=!Z((4_$xjBU>jColK$uC1Q7kvHq5vp12gsKPVg*JChVs0`+*F|09tH+R z4F(1#rQ7XGRu$wImoPA}J^`w+17iQ6Et}aGb(q!my#9am^X;0{2WfSTB8e4W-hO0C cndK^?bMD{)mPd>X?Mrxm0F`eJVL8JH0Opl2ga7~l delta 193 zcmZ3&vw(-E+~3WOfsp|S*c2x6RM+bOS!SB@SE@5IQWF^%SVDk&IUrVH|IZ?oky}y$ z6e|Jpg@IT?cnbqVPJS{-T?dfQ2f|EBjAFTo6$L=C89=@~5GycBFqG#d=B5J0b}%q7 zYA`S`Dcx>gvZ^4z7-$yj1E3l^AodU1vYCxhhgpf~lh?;TX7Q3cX2vtPO32j~@9*>3 X+|hK@QeuXK4THHP*U`-pEN2)2ZDlN` diff --git a/example/svgtofont.woff2 b/example/svgtofont.woff2 index ac4c0330342fe8ffb16d6205e08132950d7f3c34..d948b271d1979eb76a5eae5093e8959034c091d8 100644 GIT binary patch delta 1105 zcmV-X1g`t^2>1vXcTYw#00961000Dd01E&B000Q|000Clkr+6C9+D)bKqXKButxy^ z6hZwM`@JW)RFxD|rh6n5JP{HxLZi}%*5v<&51-S$$V5C7M?_o1Ylvm(PbOJYx{pb~ zTky1~*okpb7Y96Gm2*Z}*}?7y2|Gmx(7{i5F}#Xx5llPO1Drke8Ub3c zq!YG>sh<_msz_abNXJ9U1G>~us}vETjvQqpHPD1W13Q)L%`8WS6ksoahwA(B3{8WD zgvvn9N#Fh8>5X8L$9F}g6%t7}AD#&2&#gs8}Tfd8I{Bt<8Ea`d7=|TMr^L}3`**mMmxyM^3 z@6#1!wZ6}Po9HxVB@w@Gzn-i;b*Qro{i_+q5n;31Dh+SSRG%L%jqq@9fMN925t4N% zOSJ9C)&pZ1J;fd{+)RIpBfw0KsJ9!^0%Kp4J=|)uiWkSJpH+(&Di|PkI8?`gx{5B>!(GcHxK!LW%;#PzSP=x*@g3kZ{JL&$=2y_ zOYJFn?XYioDfZI)HhW=AerL}ZQ?X1(MRm>M)AQ$>dSXG31^xO>>M==YHce6af55=C zS>3bODN2d8cFMT5**%_v?%L+L*~RiLB`ey|Q(?aHwZn`>qNVr1H^*6?>6^ftgPY&=lZ?=3A^yTmW{}<*vOWV%NXrx?h=+A}1n?Q?l@dq(> zxpgaJpqWl4p%Kj;H#fpA00l9Os%XUsssYWIN3~#9tJ$sSCE^f#7y>=0hDzwbJu0Jz z0Tje8RKf2#8X$LxrC;TnoL`N zn~95fL`s}O#bm*0)r?YEkUd(hVA|M?sH!HoJz6!9XroF>-R&ATmZP84NYZLiX95MK zk!f70Aqd5IDv>8DGSS-+ieDAhCupjXCLv(vyEt4CML1CvCKJ5PP}J!yka=io2~6j- zgsQlj!FMlrszyktMk-Hu-P&nvl#*F6eIwFM81G*Nv_Rh6z_1L*@JtXB%!HtdPOXCQ XPExCJN)_c*BGa%sI$0%Zm5TxZjK&qm delta 1101 zcmV-T1hV`12=oXTcTYw#00961000DZ01E&B000Q|000Chkr+6Co*FwdsxhlT1Ax2i z5C{-F|G(Dm`!c>}br-b|MJ&XPG?(fzLZi}1oXJ2PA3mphk%@RFZtV=bK{QK$GRd0K zeZ)L1Dt2PK?gX6t2GQj1w=zvJaLdanp!|Vz^5TF8ta8pMD?8ZzAYrHI06O>yFNRmK zErMx>dVsU1UV{LC0t~3bwwSsm!e5i94bgZ=xqvQJv|d$$rz3~iNELVxIP6qzirE1R zl#6``c&NTFBMgQG1PtO3F3}sR6KC~eT!IsVRI%q zw<5!Oc2kyra(<<%?pb+$Q>fKg5k{PwFRTpLhbO7CQ=NMlX2Zua(b8jVideka2~G@e z?>iU6obK_FCk|zymL1uruG!4W2+?J@na+qwE@q+6(7GW_G4@5Rdr!1XlrF6K{HC)j z&ROb{(r)xmh^%amoDfzVS$bsmgyDZ%JA&m)4oH4~%Y?s`X64@mi9Ry^|AhZXCiJD%G3)iMi~^rd1_c*>$JLE63&0?1D2otvlmj2Vr~uu{W``({a1h={kViF?LK;^n zjXVP|h|?&Gvb!h;d7n`M){Pt%qAg{+^Hi!Ux{Zz}>Re574B7P{kvIl>b(>I_S1@gV zZ6-G2kSMVV-3tY$RS~6%pg8ma!L+d((KKDKJM=yx)4U!^?N#~tO7xTRWPJdG=21~P zh0cZ=k5J8}kvO6v6TOH~{NAuWL7_YaAz;61+ty>hu;U9CQN&rgK_C zQ(WEP+m}1_A!JmZo)ccXD)~k!h1KUQk#E9y|0;k0@@9uoqQ!_6M_jCA)w>CAB?CIA T_EKIW3iTSK3pJwk+9&`3k;Vz! diff --git a/example/symbol.html b/example/symbol.html index cecd5329..10a82f98 100644 --- a/example/symbol.html +++ b/example/symbol.html @@ -4,13 +4,13 @@ svgtofont - - - - + - + + + + - - - @@ -103,73 +99,42 @@

svgtofont5.1.0

- Converts SVG fonts to TTF/EOT/WOFF/WOFF2/SVG format. +

- GitHub · - - Feedback · - - Font Class Demo · - - Symbol Demo · - - Unicode Demo + + · + + · + + · + + · + + +

+
+

+ -

  • - -

    svgtofont-demo

    -
    • + · -
  • - -

    svgtofont-git

    -
    • + · -
  • - -

    svgtofont-left

    -
    • + · -
  • - -

    svgtofont-stylelint

    -
    • + · + + - - -

    - - GitHub · - - Feedback · - - Font Class Demo · - - Symbol Demo · - - Unicode Demo

    diff --git a/index.html b/index.html index 33f030ed..b5fca230 100644 --- a/index.html +++ b/index.html @@ -831,17 +831,17 @@

    website.template

    -

    Type: String
    Default value: index.ejs

    +

    Type: String
    Default value: index.html

    -

    Custom template can customize parameters. You can define your own template based on the default template.

    +

    Custom template can customize parameters. You can define your own template based on the default template.

    {
   website: {
-    template: path.join(process.cwd(), "my-template.ejs")
+    template: path.join(process.cwd(), "my-template.html")
   }
 }
    diff --git a/lcov-report/cli.ts.html b/lcov-report/cli.ts.html index d986fbb5..c3af06d5 100644 --- a/lcov-report/cli.ts.html +++ b/lcov-report/cli.ts.html @@ -250,7 +250,7 @@

    All files cli.ts

    Code coverage generated by istanbul - at 2024-08-29T15:44:29.164Z + at 2024-08-30T02:49:10.794Z