From dca3bcca9e1917dd3874ba9e40e1055e32caba34 Mon Sep 17 00:00:00 2001 From: Alexandre Flament Date: Fri, 18 Jun 2021 17:33:56 +0200 Subject: [PATCH] [mod] simple theme: include fonts "npm run webfont" to build the fonts directory. It requires fontforge and ttfautohint distro packages. partial revert of commit 7137d2893f33e9158e8563a21d9586119d175269 --- manage | 2 +- searx/static/themes/simple/.gitignore | 1 - searx/static/themes/simple/fonts/ion.css | 12 +- searx/static/themes/simple/fonts/ion.html | 12 +- searx/static/themes/simple/fonts/ion.svg | 4 +- searx/static/themes/simple/fonts/ion.ttf | Bin 3936 -> 3936 bytes searx/static/themes/simple/fonts/ion.woff | Bin 4856 -> 4856 bytes searx/static/themes/simple/fonts/ion.woff2 | Bin 2040 -> 2040 bytes searx/static/themes/simple/gruntfile.js | 6 +- searx/static/themes/simple/package.json | 1 + .../themes/simple/src/generated/ion.less | 181 ++++++++++++++++++ .../static/themes/simple/src/less/style.less | 4 +- utils/searx.sh | 6 +- 13 files changed, 205 insertions(+), 24 deletions(-) create mode 100644 searx/static/themes/simple/src/generated/ion.less diff --git a/manage b/manage index 9209f1d7a..64d46616b 100755 --- a/manage +++ b/manage @@ -295,7 +295,7 @@ gecko.driver() { } node.env() { - if ! required_commands npm fontforge ttfautohint; then + if ! required_commands npm; then info_msg "to install build tools use::" info_msg " sudo -H ./utils/searx.sh install buildhost" die 1 "install needed build tools first" diff --git a/searx/static/themes/simple/.gitignore b/searx/static/themes/simple/.gitignore index 2c1954c3c..07e6e472c 100644 --- a/searx/static/themes/simple/.gitignore +++ b/searx/static/themes/simple/.gitignore @@ -1,2 +1 @@ /node_modules -ion.less diff --git a/searx/static/themes/simple/fonts/ion.css b/searx/static/themes/simple/fonts/ion.css index b65aca967..100524941 100644 --- a/searx/static/themes/simple/fonts/ion.css +++ b/searx/static/themes/simple/fonts/ion.css @@ -4,12 +4,12 @@ @font-face { font-family:"ion"; - src:url("../fonts/ion.eot?14747ff3e5db3853c40bc9540e9f6c3a"); - src:url("../fonts/ion.eot?14747ff3e5db3853c40bc9540e9f6c3a#iefix") format("embedded-opentype"), - url("../fonts/ion.woff2?14747ff3e5db3853c40bc9540e9f6c3a") format("woff2"), - url("../fonts/ion.woff?14747ff3e5db3853c40bc9540e9f6c3a") format("woff"), - url("../fonts/ion.ttf?14747ff3e5db3853c40bc9540e9f6c3a") format("truetype"), - url("../fonts/ion.svg?14747ff3e5db3853c40bc9540e9f6c3a#ion") format("svg"); + src:url("../fonts/ion.eot?31a1b735188db616a2142d17947e8a45"); + src:url("../fonts/ion.eot?31a1b735188db616a2142d17947e8a45#iefix") format("embedded-opentype"), + url("../fonts/ion.woff2?31a1b735188db616a2142d17947e8a45") format("woff2"), + url("../fonts/ion.woff?31a1b735188db616a2142d17947e8a45") format("woff"), + url("../fonts/ion.ttf?31a1b735188db616a2142d17947e8a45") format("truetype"), + url("../fonts/ion.svg?31a1b735188db616a2142d17947e8a45#ion") format("svg"); font-weight:normal; font-style:normal; } diff --git a/searx/static/themes/simple/fonts/ion.html b/searx/static/themes/simple/fonts/ion.html index 011a63170..0a7b49c60 100644 --- a/searx/static/themes/simple/fonts/ion.html +++ b/searx/static/themes/simple/fonts/ion.html @@ -61,12 +61,12 @@ @font-face { font-family:"ion"; - src:url("ion.eot?14747ff3e5db3853c40bc9540e9f6c3a"); - src:url("ion.eot?14747ff3e5db3853c40bc9540e9f6c3a#iefix") format("embedded-opentype"), - url("ion.woff2?14747ff3e5db3853c40bc9540e9f6c3a") format("woff2"), - url("ion.woff?14747ff3e5db3853c40bc9540e9f6c3a") format("woff"), - url("ion.ttf?14747ff3e5db3853c40bc9540e9f6c3a") format("truetype"), - url("ion.svg?14747ff3e5db3853c40bc9540e9f6c3a#ion") format("svg"); + src:url("ion.eot?31a1b735188db616a2142d17947e8a45"); + src:url("ion.eot?31a1b735188db616a2142d17947e8a45#iefix") format("embedded-opentype"), + url("ion.woff2?31a1b735188db616a2142d17947e8a45") format("woff2"), + url("ion.woff?31a1b735188db616a2142d17947e8a45") format("woff"), + url("ion.ttf?31a1b735188db616a2142d17947e8a45") format("truetype"), + url("ion.svg?31a1b735188db616a2142d17947e8a45#ion") format("svg"); font-weight:normal; font-style:normal; } diff --git a/searx/static/themes/simple/fonts/ion.svg b/searx/static/themes/simple/fonts/ion.svg index c16155aab..01c2ce025 100644 --- a/searx/static/themes/simple/fonts/ion.svg +++ b/searx/static/themes/simple/fonts/ion.svg @@ -1,11 +1,11 @@ -Created by FontForge 20190801 at Wed Jun 16 14:20:50 2021 +Created by FontForge 20190801 at Mon Jun 21 10:06:22 2021 By alexandre diff --git a/searx/static/themes/simple/fonts/ion.ttf b/searx/static/themes/simple/fonts/ion.ttf index 8334ba424068d1aa4fe09a3f55a878714b4ccc9f..78264a5717dd56fafb5fa7d0901235f8b5ae30e1 100644 GIT binary patch delta 105 zcmaDL_drgBfsuiMftR6yftew|%`L=tN^xS(M3ER4X-1>Ui6uTPJDyl=o_It-W{J9G uRXo4VR|ak-pauqpJ70hNgVCE9=kYKbF&Iu>$g9R=WVrbxZx16kk~{#L3nXX& delta 105 zcmaDL_drgBfsuiMftR6yftew|%`L=tO4`aR6GdWJq`p)goLJ(+a_EWWrin)sWF|yO u#l-X5d}ZKf0%~AjxbuFl5{%x&IFEml#bRla1 diff --git a/searx/static/themes/simple/fonts/ion.woff b/searx/static/themes/simple/fonts/ion.woff index dec02f7d6eccd6cd7da4bbbe8039a583e3ac093b..84dd558889db2f1782b1b281e248561d231568d3 100644 GIT binary patch delta 286 zcmV+(0pb4mCHN(fQ3G>fjFD701RDi1d6AGz1i0invytE(CcRf$AL99KzA|t#F@V6G zuRs35Y3ctD8SgXB2XZ+Wz|sJYL=N^Qh+lsGH?$zuE5Bd zcufrwv21^io#z0U;(-L;lPV|3Fi}o1!a_MC)yg@moALm2Je7yMf76qEtg1aHvD0(P zy))$u8!VM`&RmrTFt{rZX|GP|fEGulmSGFe&s@-8kHFH`mu63>;>&RmoSFt{lXY0r<;9vu!$9m58mpE;w&4uPd_&h3s+$C*>iffJrW4kd&^ zc}4FvdbX%gM0e~v)~LI~sqRAKjVr~h40kcws;CMl&i?;lOZ9-`Pg7_%?vl6<{9 diff --git a/searx/static/themes/simple/fonts/ion.woff2 b/searx/static/themes/simple/fonts/ion.woff2 index 17ef58b9c0f3bac457156eb16400319d4fcf92c3..1ab664a676d7278053a4deffc5b053509de01323 100644 GIT binary patch delta 1971 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 FS`ZRc?