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 8334ba424..78264a571 100644 Binary files a/searx/static/themes/simple/fonts/ion.ttf and b/searx/static/themes/simple/fonts/ion.ttf differ diff --git a/searx/static/themes/simple/fonts/ion.woff b/searx/static/themes/simple/fonts/ion.woff index dec02f7d6..84dd55888 100644 Binary files a/searx/static/themes/simple/fonts/ion.woff and b/searx/static/themes/simple/fonts/ion.woff differ diff --git a/searx/static/themes/simple/fonts/ion.woff2 b/searx/static/themes/simple/fonts/ion.woff2 index 17ef58b9c..1ab664a67 100644 Binary files a/searx/static/themes/simple/fonts/ion.woff2 and b/searx/static/themes/simple/fonts/ion.woff2 differ diff --git a/searx/static/themes/simple/gruntfile.js b/searx/static/themes/simple/gruntfile.js index 1dea80bd4..e34d4ee4f 100644 --- a/searx/static/themes/simple/gruntfile.js +++ b/searx/static/themes/simple/gruntfile.js @@ -7,7 +7,7 @@ module.exports = function(grunt) { watch: { scripts: { files: ['src/**'], - tasks: ['jshint', 'concat', 'uglify', 'webfont', 'less:development', 'less:production'] + tasks: ['jshint', 'copy', 'concat', 'uglify', 'less:development', 'less:production'] } }, jshint: { @@ -117,7 +117,7 @@ module.exports = function(grunt) { 'node_modules/ionicons-npm/src/android-close.svg', ], dest: 'fonts', - destLess: '.', + destLess: 'src/generated', options: { font: 'ion', hashes : true, @@ -194,5 +194,5 @@ module.exports = function(grunt) { grunt.registerTask('test', ['jshint']); - grunt.registerTask('default', ['jshint', 'copy', 'concat', 'uglify', 'webfont', 'less:development', 'less:production']); + grunt.registerTask('default', ['jshint', 'copy', 'concat', 'uglify', 'less:development', 'less:production']); }; diff --git a/searx/static/themes/simple/package.json b/searx/static/themes/simple/package.json index d31aa2041..5c075d154 100644 --- a/searx/static/themes/simple/package.json +++ b/searx/static/themes/simple/package.json @@ -24,6 +24,7 @@ "all": "npm install && grunt", "build": "grunt", "watch": "grunt watch", + "webfont": "grunt webfont", "clean": "rm -Rf node_modules package-lock.json ion.less" } } diff --git a/searx/static/themes/simple/src/generated/ion.less b/searx/static/themes/simple/src/generated/ion.less new file mode 100644 index 000000000..67158206f --- /dev/null +++ b/searx/static/themes/simple/src/generated/ion.less @@ -0,0 +1,181 @@ +// Generated by grunt-webfont + + + +@font-face { + font-family:"ion"; + 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; +} + +.ion-icon { + &:before { + font-family:"ion"; + } + display:inline-block; + line-height:1; + font-weight:normal; + font-style:normal; + speak:none; + text-decoration:inherit; + text-transform:none; + text-rendering:auto; + -webkit-font-smoothing:antialiased; + -moz-osx-font-smoothing:grayscale; +} + + +// Icons + +.ion-navicon-round { + &:before { + content:"\f101"; + } +} + + +.ion-search { + &:before { + content:"\f102"; + } +} + + +.ion-play { + &:before { + content:"\f103"; + } +} + + +.ion-link { + &:before { + content:"\f104"; + } +} + + +.ion-chevron-up { + &:before { + content:"\f105"; + } +} + + +.ion-chevron-left { + &:before { + content:"\f106"; + } +} + + +.ion-chevron-right { + &:before { + content:"\f107"; + } +} + + +.ion-arrow-down-a { + &:before { + content:"\f108"; + } +} + + +.ion-arrow-up-a { + &:before { + content:"\f109"; + } +} + + +.ion-arrow-swap { + &:before { + content:"\f10a"; + } +} + + +.ion-arrow-dropdown { + &:before { + content:"\f10b"; + } +} + + +.ion-globe { + &:before { + content:"\f10c"; + } +} + + +.ion-time { + &:before { + content:"\f10d"; + } +} + + +.ion-location { + &:before { + content:"\f10e"; + } +} + + +.ion-warning { + &:before { + content:"\f10f"; + } +} + + +.ion-error { + &:before { + content:"\f110"; + } +} + + +.ion-film-outline { + &:before { + content:"\f111"; + } +} + + +.ion-music-note { + &:before { + content:"\f112"; + } +} + + +.ion-more-vertical { + &:before { + content:"\f113"; + } +} + + +.ion-magnet { + &:before { + content:"\f114"; + } +} + + +.ion-close { + &:before { + content:"\f115"; + } +} + diff --git a/searx/static/themes/simple/src/less/style.less b/searx/static/themes/simple/src/less/style.less index e0feb6da3..5ffd7d59b 100644 --- a/searx/static/themes/simple/src/less/style.less +++ b/searx/static/themes/simple/src/less/style.less @@ -11,6 +11,8 @@ @import (inline) "../../node_modules/normalize.css/normalize.css"; +@import "../generated/ion.less"; + @import "definitions.less"; @import "mixins.less"; @@ -22,8 +24,6 @@ @import "autocomplete.less"; // ion-icon -@import "../../ion.less"; - .ion-icon-big { .ion-icon; font-size: 149%; diff --git a/utils/searx.sh b/utils/searx.sh index 69068b914..a777eab26 100755 --- a/utils/searx.sh +++ b/utils/searx.sh @@ -51,7 +51,7 @@ shellcheck" BUILD_PACKAGES_debian="\ firefox graphviz imagemagick texlive-xetex librsvg2-bin texlive-latex-recommended texlive-extra-utils fonts-dejavu -latexmk fontforge ttfautohint +latexmk npm" # pacman packages @@ -63,7 +63,7 @@ shellcheck" BUILD_PACKAGES_arch="\ firefox graphviz imagemagick texlive-bin extra/librsvg -texlive-core texlive-latexextra ttf-dejavu fontforge ttfautohint +texlive-core texlive-latexextra ttf-dejavu npm" # dnf packages @@ -77,7 +77,7 @@ BUILD_PACKAGES_fedora="\ firefox graphviz graphviz-gd ImageMagick librsvg2-tools texlive-xetex-bin texlive-collection-fontsrecommended texlive-collection-latex dejavu-sans-fonts dejavu-serif-fonts -dejavu-sans-mono-fonts fontforge ttfautohint +dejavu-sans-mono-fonts npm" # yum packages