summaryrefslogtreecommitdiff
path: root/searx
diff options
context:
space:
mode:
authorMrPaulBlack <paul@paulgo.io>2021-11-13 10:42:07 +0100
committerMrPaulBlack <paul@paulgo.io>2021-11-13 10:42:07 +0100
commit566dfe33307e33e4cb54dc6eae17fb373a09684e (patch)
tree606e48f0b83a833fbad7aa166bd5a0858fbd4090 /searx
parent8877512e20edf86221b1de66808e2ab284770844 (diff)
downloadsearxng-566dfe33307e33e4cb54dc6eae17fb373a09684e.tar.gz
searxng-566dfe33307e33e4cb54dc6eae17fb373a09684e.zip
[simple theme] update to ion icons 5 and drop webfont
* update from ionicons-npm to ionicons ver.5 * drop the webfont built by grunt for icons * built icons.html template for inlining icons with jinja2 into html * update icon to use mostly the outline version * add icons to categories and do not display them on mobile to save space * remove all legacy ion icon font files from simple theme * icons.html is added in this commit since make statc.build.restore requires git to know the file already * cleanup error-dialog
Diffstat (limited to 'searx')
-rw-r--r--searx/static/themes/simple/fonts/ion.css139
-rw-r--r--searx/static/themes/simple/fonts/ion.html268
-rw-r--r--searx/static/themes/simple/fonts/ion.svg105
-rw-r--r--searx/static/themes/simple/fonts/ion.ttfbin3936 -> 0 bytes
-rw-r--r--searx/static/themes/simple/fonts/ion.woffbin4856 -> 0 bytes
-rw-r--r--searx/static/themes/simple/fonts/ion.woff2bin2040 -> 0 bytes
-rw-r--r--searx/static/themes/simple/gruntfile.js153
-rw-r--r--searx/static/themes/simple/package.json14
-rw-r--r--searx/static/themes/simple/src/fonts/magnet.svg1
-rw-r--r--searx/static/themes/simple/src/generated/ion.less181
-rw-r--r--searx/static/themes/simple/src/less/search.less75
-rw-r--r--searx/static/themes/simple/src/less/style.less20
-rw-r--r--searx/static/themes/simple/src/less/toolkit.less13
-rw-r--r--searx/templates/simple/categories.html20
-rw-r--r--searx/templates/simple/icons.html36
-rw-r--r--searx/templates/simple/index.html4
-rw-r--r--searx/templates/simple/macros.html11
-rw-r--r--searx/templates/simple/messages/no_results.html22
-rw-r--r--searx/templates/simple/preferences.html9
-rw-r--r--searx/templates/simple/result_templates/images.html4
-rw-r--r--searx/templates/simple/result_templates/map.html5
-rw-r--r--searx/templates/simple/result_templates/torrent.html10
-rw-r--r--searx/templates/simple/results.html23
-rw-r--r--searx/templates/simple/search.html4
-rw-r--r--searx/templates/simple/simple_search.html4
-rw-r--r--searx/templates/simple/stats.html4
26 files changed, 258 insertions, 867 deletions
diff --git a/searx/static/themes/simple/fonts/ion.css b/searx/static/themes/simple/fonts/ion.css
deleted file mode 100644
index 100524941..000000000
--- a/searx/static/themes/simple/fonts/ion.css
+++ /dev/null
@@ -1,139 +0,0 @@
-/* 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 {
-
- 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/fonts/ion.html b/searx/static/themes/simple/fonts/ion.html
deleted file mode 100644
index 0a7b49c60..000000000
--- a/searx/static/themes/simple/fonts/ion.html
+++ /dev/null
@@ -1,268 +0,0 @@
-<!doctype html>
-<html>
- <head>
- <meta charset="utf-8">
- <title>ion</title>
- <style>
- body {
- margin:0;
- padding:10px 20px;
- background:#fff;
- color:#222;
- }
- h1, div, footer {
- font-family:"Helvetica Neue", Arial, sans-serif;
- }
- h1 {
- margin:0 0 20px;
- font-size:32px;
- font-weight:normal;
- }
- h1 small {
- font-size: 0.8em;
- padding-left: 2em;
- }
- .icons {
- margin-bottom:40px;
- -webkit-column-count:5;
- -moz-column-count:5;
- column-count:5;
- -webkit-column-gap:20px;
- -moz-column-gap:20px;
- column-gap:20px;
- }
- .icons__item,
- .icons__item i {
- line-height:2em;
- cursor:pointer;
- overflow:hidden;
- }
- .icons__item:hover {
- color:#3c90be;
- }
- .icons__item i {
- display:inline-block;
- width:32px;
- text-align:center;
- }
- .icons__item:hover i {
- -webkit-transform:scale(1.5);
- transform:scale(1.5);
- }
- footer {
- margin-top:40px;
- font-size:14px;
- color:#999;
- }
-
- /* Generated by grunt-webfont */
-
-
-
-@font-face {
- font-family:"ion";
- 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;
-}
-
-.ion-icon {
-
- 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";
-}
-
- </style>
- </head>
- <body>
- <h1>ion</h1>
-
- <div class="icons" id="icons">
-
- <div class="icons__item" data-name="navicon-round"><i class="ion-icon ion-navicon-round"></i> ion-navicon-round</div>
-
- <div class="icons__item" data-name="search"><i class="ion-icon ion-search"></i> ion-search</div>
-
- <div class="icons__item" data-name="play"><i class="ion-icon ion-play"></i> ion-play</div>
-
- <div class="icons__item" data-name="link"><i class="ion-icon ion-link"></i> ion-link</div>
-
- <div class="icons__item" data-name="chevron-up"><i class="ion-icon ion-chevron-up"></i> ion-chevron-up</div>
-
- <div class="icons__item" data-name="chevron-left"><i class="ion-icon ion-chevron-left"></i> ion-chevron-left</div>
-
- <div class="icons__item" data-name="chevron-right"><i class="ion-icon ion-chevron-right"></i> ion-chevron-right</div>
-
- <div class="icons__item" data-name="arrow-down-a"><i class="ion-icon ion-arrow-down-a"></i> ion-arrow-down-a</div>
-
- <div class="icons__item" data-name="arrow-up-a"><i class="ion-icon ion-arrow-up-a"></i> ion-arrow-up-a</div>
-
- <div class="icons__item" data-name="arrow-swap"><i class="ion-icon ion-arrow-swap"></i> ion-arrow-swap</div>
-
- <div class="icons__item" data-name="arrow-dropdown"><i class="ion-icon ion-arrow-dropdown"></i> ion-arrow-dropdown</div>
-
- <div class="icons__item" data-name="globe"><i class="ion-icon ion-globe"></i> ion-globe</div>
-
- <div class="icons__item" data-name="time"><i class="ion-icon ion-time"></i> ion-time</div>
-
- <div class="icons__item" data-name="location"><i class="ion-icon ion-location"></i> ion-location</div>
-
- <div class="icons__item" data-name="warning"><i class="ion-icon ion-warning"></i> ion-warning</div>
-
- <div class="icons__item" data-name="error"><i class="ion-icon ion-error"></i> ion-error</div>
-
- <div class="icons__item" data-name="film-outline"><i class="ion-icon ion-film-outline"></i> ion-film-outline</div>
-
- <div class="icons__item" data-name="music-note"><i class="ion-icon ion-music-note"></i> ion-music-note</div>
-
- <div class="icons__item" data-name="more-vertical"><i class="ion-icon ion-more-vertical"></i> ion-more-vertical</div>
-
- <div class="icons__item" data-name="magnet"><i class="ion-icon ion-magnet"></i> ion-magnet</div>
-
- <div class="icons__item" data-name="close"><i class="ion-icon ion-close"></i> ion-close</div>
-
- </div>
-
-
-
- <h1>Usage</h1>
- <pre><code>&lt;i class=&quot;ion-icon ion-<span id="name">name</span>&quot;&gt;&lt;/i&gt;</code></pre>
-
-
- <footer>Generated by <a href="https://github.com/sapegin/grunt-webfont">grunt-webfont</a>.</footer>
-
- <script>
- (function() {
- document.getElementById('icons').onclick = function(e) {
- e = e || window.event;
- var name = e.target.getAttribute('data-name') || e.target.parentNode.getAttribute('data-name');
- document.getElementById('name').innerHTML = name;
-
- }
- })();
- </script>
- </body>
-</html>
diff --git a/searx/static/themes/simple/fonts/ion.svg b/searx/static/themes/simple/fonts/ion.svg
deleted file mode 100644
index 01c2ce025..000000000
--- a/searx/static/themes/simple/fonts/ion.svg
+++ /dev/null
@@ -1,105 +0,0 @@
-<?xml version="1.0" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" >
-<!--
-2021-6-21: Created with FontForge (http://fontforge.org)
--->
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1">
-<metadata>
-Created by FontForge 20190801 at Mon Jun 21 10:06:22 2021
- By alexandre
-
-</metadata>
-<defs>
-<font id="ion" horiz-adv-x="512" >
- <font-face
- font-family="ion"
- font-weight="400"
- font-stretch="normal"
- units-per-em="512"
- panose-1="2 0 5 9 0 0 0 0 0 0"
- ascent="448"
- descent="-64"
- bbox="27.2368 -31.9632 479.993 415.9"
- underline-thickness="25.6"
- underline-position="-51.2"
- unicode-range="U+F101-F115"
- />
- <missing-glyph />
- <glyph glyph-name="arrow-down-a" unicode="&#xf108;"
-d="M256.5 -0.5l-192 192h112v192h160v-192h112z" />
- <glyph glyph-name="arrow-dropdown" unicode="&#xf10b;"
-d="M128 256h256l-128 -128z" />
- <glyph glyph-name="arrow-swap" unicode="&#xf10a;"
-d="M64 120c0 4.40039 3.59961 8 8 8h248v64l128 -96l-128 -96v64h-248c-4.40039 0 -8 3.59961 -8 8v48zM448 264c0 -4.40039 -3.59961 -8 -8 -8h-248v-64l-128 96l128 96v-64h248c4.40039 0 8 -3.59961 8 -8v-48z" />
- <glyph glyph-name="arrow-up-a" unicode="&#xf109;"
-d="M256.5 383.5l192 -192h-112v-192h-160v192h-112z" />
- <glyph glyph-name="chevron-left" unicode="&#xf106;"
-d="M213.7 192l167.2 -174.2c4.19922 -4.2998 4.09961 -11.3994 -0.200195 -15.7998l-29.9004 -30.5996c-4.2998 -4.40039 -11.2998 -4.5 -15.5 -0.200195l-204.2 212.7c-2.09961 2.19922 -3.09961 5.09961 -3 8.09961c-0.199219 2.90039 0.800781 5.90039 3 8.09961
-l204.2 212.601c4.2002 4.2998 11.2002 4.2002 15.5 -0.200195l29.9004 -30.5996c4.2998 -4.40039 4.39941 -11.5 0.200195 -15.8008l-167.2 -174.1v0v0z" />
- <glyph glyph-name="chevron-right" unicode="&#xf107;"
-d="M298.3 192v0v0l-167.2 174.1c-4.19922 4.30078 -4.09961 11.4004 0.200195 15.8008l29.9004 30.5996c4.2998 4.40039 11.2998 4.5 15.5 0.200195l204.2 -212.7c2.19922 -2.2002 3.19922 -5.2002 3 -8.09961c0.0996094 -3 -0.900391 -5.90039 -3 -8.10059l-204.2 -212.6
-c-4.2002 -4.2998 -11.2002 -4.2002 -15.5 0.200195l-29.9004 30.5996c-4.2998 4.40039 -4.39941 11.5 -0.200195 15.7998z" />
- <glyph glyph-name="chevron-up" unicode="&#xf105;"
-d="M256 234.3l-174.2 -167.2c-4.2998 -4.19922 -11.3994 -4.09961 -15.7998 0.200195l-30.5996 29.9004c-4.40039 4.2998 -4.5 11.2998 -0.200195 15.5l212.7 204.2c2.19922 2.09961 5.09961 3.09961 8.09961 3c2.90039 0.199219 5.90039 -0.800781 8.09961 -3l212.7 -204.2
-c4.2998 -4.2002 4.2002 -11.2002 -0.200195 -15.5l-30.5996 -29.9004c-4.40039 -4.2998 -11.5 -4.39941 -15.7998 -0.200195l-174.2 167.2v0v0z" />
- <glyph glyph-name="close" unicode="&#xf115;"
-d="M405 311.202l-119.202 -119.202l119.202 -119.202l-29.7979 -29.7979l-119.202 119.202l-119.202 -119.202l-29.7979 29.7979l119.202 119.202l-119.202 119.202l29.7979 29.7979l119.202 -119.202l119.202 119.202z" />
- <glyph glyph-name="error" unicode="&#xf110;"
-d="M256 400c114.4 0 208 -93.6006 208 -208s-93.5996 -208 -208 -208s-208 93.6006 -208 208s93.5996 208 208 208zM280 88v40h-48v-40h48zM280 176v128h-48v-128h48z" />
- <glyph glyph-name="film-outline" unicode="&#xf111;"
-d="M56 360h400v-336h-400v336zM128 40v48h-56v-48h56zM128 104v48h-56v-48h56zM128 168v48h-56v-48h56zM128 232v48h-56v-48h56zM128 296v48h-56v-48h56zM368 40v144h-224v-144h224zM368 200v144h-224v-144h224zM440 40v48h-56v-48h56zM440 104v48h-56v-48h56zM440 168v48
-h-56v-48h56zM440 232v48h-56v-48h56zM440 296v48h-56v-48h56z" />
- <glyph glyph-name="globe" unicode="&#xf10c;"
-d="M256 400c114.875 0 208 -93.125 208 -208s-93.125 -208 -208 -208c-114.876 0 -208 93.125 -208 208s93.124 208 208 208zM234.451 15.001c6.04297 15.0449 19.9453 28.6484 7.27344 39.1172c-8.17285 6.75 -15.6123 13.6279 -23.1104 21.125
-c-2.47461 2.47363 -9.9082 19.7109 -8.35156 22.3916c5.10254 8.78613 5.76367 14.8613 8.12988 24.7236c2.94336 12.2627 -3.33398 15.4434 -13.3828 21.8389c-15.2256 9.68848 -28.9629 22.4844 -43.3213 33.4941c-7.11719 5.45508 -17.4365 10.0986 -20.0195 18.9521
-c-2.64062 9.05078 -3.97363 20.2598 -9.40039 28.0781c-13.9277 20.0752 -11.5791 34.9678 -9.93945 58.7627c0.449219 6.52637 -1.30371 15.6572 -2.01367 24.1748c-27.5654 -32.2354 -42.6016 -72.7891 -42.6016 -115.659c0 -47.6221 18.5439 -92.3926 52.2178 -126.067
-c28.541 -28.54 65.0557 -46.2061 104.52 -50.9316zM382.067 65.9326c23.0352 23.0381 38.9873 51.2695 46.7686 82.0527c-8.34668 -1.19141 -18.3838 2.22754 -18.3838 2.22754s-21.7363 23.707 -23.5244 44.5723c-1.85645 21.667 0.498047 38.3945 -2.89551 56.8105
-c-2.87988 15.624 -19.2803 31.5 -26.6729 46.3018c-6.9209 13.8555 -13.7334 27.7031 -20.2646 41.7451c2.25098 -0.848633 4.90039 -1.40234 6.96484 -2.62305c4.99902 0.636719 9.43066 1.22949 13.4629 1.59082c-22.5381 15.6758 -48.2725 25.8418 -75.5225 29.7998
-v-8.33887l3.55273 -9.27734l-13.7783 -12.9951l-8.67578 2.79492l-9.92383 10.2334l-9.94336 11.8008l-14.084 5.66016c-15.7236 -2.36133 -30.9346 -6.78711 -45.3105 -13.1523c0.360352 -2.30762 0.662109 -4.64453 0.662109 -7.13281
-c7.17383 2.98926 15.2764 5.04883 22.4502 8.03906c2.96289 1.23438 12.7529 -7.1748 15.6221 -8.96777c-4.0957 -4.70996 -20.5576 -15.4434 -21.3574 -21.3574c-0.316406 -2.33984 6.50586 -6.06348 6.45117 -9.69141
-c-0.0878906 -5.74609 -0.173828 -11.4912 -0.259766 -17.2373c3.24414 2.76172 20.0342 20.3672 21.9404 20.8594c12.7256 3.2832 34.3916 -17.7646 36.249 -25.1934c1.8584 -7.42871 -21.6514 -23.6826 -32.6113 -34.0469
-c-8.39941 -7.94434 -24.8086 -12.5137 -19.8037 -24.2285c1.62695 -3.80957 10.0508 -20.0156 5.21191 -24.0586c-5.92188 -4.94824 -14.7686 8.97656 -17.3418 12.0938c-8.15332 9.87695 -25.626 6.02539 -37.9082 6.47852c0 -17.4209 -0.757812 -31.1885 14.9229 -42.9971
-c15.1943 -11.4434 29.5967 -24.7061 47.0771 -32.3389c12.7637 -5.57129 35.7158 6.53613 47.0205 -1.41699c15.8672 -11.165 29.3066 -21.624 47.1611 -29.375c7.93359 -3.44531 32.418 -19.8828 25.3525 -30.7812c-4.96582 -7.66211 -9.87305 -14.8848 -13.5771 -23.2168
-c-3.70703 -8.34375 -12.5957 -18.876 -19.6924 -24.3525c-8.15918 -6.29199 -16.9551 -17.1455 -21.8955 -29.3623c34.8574 6.5957 66.9229 23.4482 92.5566 49.0811z" />
- <glyph glyph-name="link" unicode="&#xf104;"
-d="M256.5 240h-0.5v0h0.5zM368.5 288c44.2002 0 79.5 -35.2998 79.5 -79.5v-32c0 -44.2002 -35.2998 -80.5 -79.5 -80.5h-112c-32.7002 0 -61 19.7998 -73.5996 48c-4.40039 10 -6.90039 21 -6.90039 32.5v31.5h48v-31.5c0 -17.5996 14.9004 -32.5 32.5 -32.5h112
-c17.5996 0 31.5 14.9004 31.5 32.5v32c0 17.5996 -13.9004 31.5 -31.5 31.5h-0.5h-16.4004c-5.59961 31 -31.5996 48 -31.5996 48h48.5zM329.6 240c4.10059 -9.59961 6.40039 -20.2998 6.40039 -31.5v-32v-0.5h-48v0.5v32c0 17.5996 -13.9004 31.5 -31.5 31.5h-0.5h-111.5
-c-17.5996 0 -32.5 -13.9004 -32.5 -31.5v-32c0 -17.5996 14.9004 -32.5 32.5 -32.5h15.4004c6.2998 -31 32.0996 -48 32.0996 -48h-47.5c-44.2002 0 -80.5 36.2998 -80.5 80.5v32c0 44.2002 36.2998 79.5 80.5 79.5h112c33 0 61 -19.7002 73.0996 -48z" />
- <glyph glyph-name="location" unicode="&#xf10e;"
-d="M256 384c65.9004 0 119.3 -53.7002 119.3 -120c0 -114.6 -119.3 -264 -119.3 -264s-119.3 149.4 -119.3 264c0 66.2998 53.3994 120 119.3 120zM256 205.8c31.2002 0 56.4004 25.4004 56.4004 56.7002c0 31.4004 -25.2002 56.7998 -56.4004 56.7998
-c-31.0996 0 -56.4004 -25.5 -56.4004 -56.7998s25.2002 -56.7002 56.4004 -56.7002z" />
- <glyph glyph-name="magnet" unicode="&#xf114;"
-d="M27.7061 117.644h86.2139v-67.7236h-86.2256zM184.326 327c0 -0.199219 0.166992 -0.366211 0.367188 -0.366211c27.7676 0 67.3604 -3.08398 67.3604 -42.7246v-141.625c0 -0.197266 0.163086 -0.362305 0.358398 -0.366211
-c28.75 -0.636719 57.4912 0.0107422 86.2236 0c0.208984 -0.000976562 0.366211 0.183594 0.367188 0.364258c0.238281 50.8672 0 101.591 0 150.867c-0.250977 43.4795 -13.5273 70.627 -43.2588 92.6426c-33.1963 25.7178 -71.71 27.2451 -112.575 27.3818
-c-40.8711 -0.136719 -79.3877 -1.66406 -112.583 -27.3818c-29.7207 -22.0166 -42.9971 -49.1611 -43.248 -92.6445c0 -49.2715 -0.227539 -99.999 0 -150.876c0.000976562 -0.208984 0.185547 -0.365234 0.367188 -0.365234c28.7324 0.0224609 57.4854 -0.625 86.2236 0
-c0.196289 0.00390625 0.358398 0.170898 0.358398 0.366211v141.625c0 39.6406 39.6045 42.7363 67.3604 42.7363c0.200195 0 0.367188 0.166992 0.367188 0.366211s-0.166992 0.366211 -0.367188 0.366211c-27.6299 0 -68.0938 -3.06348 -68.0938 -43.4688v-141.266
-c-28.2832 -0.604492 -56.9688 0.0244141 -85.4844 0.0078125c-0.223633 50.5547 0.00195312 101.386 0.00195312 150.508c0.249023 43.3125 13.4043 70.168 42.957 92.0605c32.9863 25.5547 71.2646 27.0957 112.144 27.2324
-c40.8623 -0.136719 79.1436 -1.67773 112.13 -27.2324c29.5645 -21.8926 42.7188 -48.7461 42.9678 -92.0625c0 -49.1631 0.238281 -99.6865 0.00195312 -150.495c-28.3008 0.00585938 -56.9746 -0.62793 -85.4844 -0.0078125v141.267
-c0 40.4043 -40.4521 43.457 -68.0938 43.457c-0.200195 0 -0.367188 -0.166992 -0.367188 -0.366211zM184.692 327.005c27.7061 0 67.7236 -3.07227 67.7236 -43.1006v-141.615c28.7422 -0.639648 57.4834 0.0117188 86.2256 0c0.232422 50.8633 0 101.586 0 150.854
-c-0.255859 43.4033 -13.4746 70.3994 -43.1133 92.3574c-33.0938 25.6348 -71.4932 27.1709 -112.36 27.3105c-40.8672 -0.139648 -79.2666 -1.67578 -112.36 -27.3105c-29.6377 -21.958 -42.8574 -48.9541 -43.1016 -92.3574c0 -49.2686 -0.232422 -99.9912 0 -150.866
-c28.7422 0.0234375 57.4834 -0.62793 86.2139 0v141.615c0 40.0293 40.0293 43.1123 67.7236 43.1123zM252.463 117.644h86.2021v-67.7236h-86.2021v67.7236z" />
- <glyph glyph-name="more-vertical" unicode="&#xf113;"
-d="M296 312c0 -22.002 -17.998 -40 -40 -40s-40 17.998 -40 40s17.998 40 40 40s40 -17.998 40 -40zM296 72c0 -22.002 -17.998 -40 -40 -40s-40 17.998 -40 40s17.998 40 40 40s40 -17.998 40 -40zM296 192c0 -22.002 -17.998 -40 -40 -40s-40 17.998 -40 40
-s17.998 40 40 40s40 -17.998 40 -40z" />
- <glyph glyph-name="music-note" unicode="&#xf112;"
-d="M426 415.9c12.0996 0 22 -9.5 22.0996 -21.2002v-302.8c0 -24.7002 -3 -42.9004 -12 -54.9004h-0.199219c-9.10059 -15 -25 -21 -43.2002 -21h-37.2002c-28.2998 0 -51.2002 19.9004 -51.2002 48s22.9004 48 51.2002 48h60.5v192l-208 -38v-232
-c0 -8.2998 -3.40039 -27 -13 -41.0996c-1 -1.80078 -2.09961 -3.40039 -3.40039 -5c-0.5 -0.600586 -0.899414 -1.5 -1.5 -2.10059c-0.0996094 -0.0996094 -0.299805 -0.0996094 -0.399414 -0.200195c-9.40039 -10.5996 -23 -17.5 -38.2998 -17.5h-36.2002
-c-28.2002 0 -51.2998 20 -51.2998 48s23.0996 48 51.0996 48v-0.0996094h61v286.5c1 14.5 13.5 27.9004 27.2998 31.5996l217.601 33.2002s2.89941 0.600586 5.09961 0.600586z" />
- <glyph glyph-name="navicon-round" unicode="&#xf101;"
-d="M417.4 224c16.8994 0 30.5996 -14.2998 30.5996 -32s-13.7002 -32 -30.5996 -32h-322.801c-16.8994 0 -30.5996 14.2998 -30.5996 32s13.7002 32 30.5996 32h322.801zM417.4 352c16.8994 0 30.5996 -14.2998 30.5996 -32s-13.7002 -32 -30.5996 -32h-322.801
-c-16.8994 0 -30.5996 14.2998 -30.5996 32s13.7002 32 30.5996 32h322.801zM417.4 96c16.8994 0 30.5996 -14.2998 30.5996 -32s-13.7002 -32 -30.5996 -32h-322.801c-16.8994 0 -30.5996 14.2998 -30.5996 32s13.7002 32 30.5996 32h322.801z" />
- <glyph glyph-name="play" unicode="&#xf103;"
-d="M405.2 215.1c6.59961 -5.59961 10.7998 -13.7998 10.7998 -23.0996s-4.2002 -17.5996 -10.7998 -23.0996l-278.101 -165.5c-3.69922 -2 -7.09961 -3.40039 -11.1992 -3.40039c-10.9004 0 -19.8008 9 -19.8008 20h-0.0996094v344h0.0996094c0 11 8.90039 20 19.8008 20
-c4 0 7.5 -1.2002 10.8994 -3.2002z" />
- <glyph glyph-name="search" unicode="&#xf102;"
-d="M445 61.2998c4 -4 4 -10.3994 0 -14.5l-43.2998 -43.7998c-1.90039 -2 -4.60059 -3.09961 -7.2998 -3.09961c-2.7002 0 -5.40039 1.19922 -7.30078 3.09961l-84.3994 85.5996c-24.6006 -14.6992 -52.2002 -22.3994 -80.1006 -22.3994
-c-87.3994 0 -158.6 71.2998 -158.6 158.899c0 87.6006 71.2002 158.9 158.6 158.9c87.4004 0 158.601 -71.2998 158.601 -158.9c0 -27 -7.2002 -53.7998 -21 -77.8994zM222.6 322.1c-53.3994 0 -96.7998 -43.5 -96.7998 -97s43.4004 -97 96.7998 -97
-c53.4004 0 96.8008 43.5 96.8008 97s-43.4004 97 -96.8008 97z" />
- <glyph glyph-name="time" unicode="&#xf10d;"
-d="M256 405c117.149 0 213 -95.8506 213 -213s-94.7891 -213 -213 -213s-213 95.8506 -213 213s94.7891 213 213 213zM256 21.5996c93.7178 0 170.4 76.6826 170.4 170.4s-76.6826 170.4 -170.4 170.4s-170.4 -76.6836 -170.4 -170.4s76.6826 -170.4 170.4 -170.4z
-M266.65 298.5v-111.824l95.8496 -56.4434l-15.9746 -26.625l-111.825 67.0928v127.8h31.9502z" />
- <glyph glyph-name="warning" unicode="&#xf10f;"
-d="M476.7 25.7998c2.7998 -4.89941 4.7998 -13 1.7998 -17.8994c-2.90039 -4.90039 -8.2002 -7.90039 -14 -7.90039h-417.1c-5.80078 0 -11.1006 3 -14 7.90039c-2.90039 4.89941 -0.900391 12.8994 1.89941 17.8994l206.601 349.5c2.7998 5 8.19922 8.7002 14.0996 8.7002
-c5.7998 0 11.2002 -3.7002 14.0996 -8.7002zM288 48v48h-64v-48h64zM288 128v144h-64v-144h64z" />
- </font>
-</defs></svg>
diff --git a/searx/static/themes/simple/fonts/ion.ttf b/searx/static/themes/simple/fonts/ion.ttf
deleted file mode 100644
index 78264a571..000000000
--- a/searx/static/themes/simple/fonts/ion.ttf
+++ /dev/null
Binary files differ
diff --git a/searx/static/themes/simple/fonts/ion.woff b/searx/static/themes/simple/fonts/ion.woff
deleted file mode 100644
index 84dd55888..000000000
--- a/searx/static/themes/simple/fonts/ion.woff
+++ /dev/null
Binary files differ
diff --git a/searx/static/themes/simple/fonts/ion.woff2 b/searx/static/themes/simple/fonts/ion.woff2
deleted file mode 100644
index 1ab664a67..000000000
--- a/searx/static/themes/simple/fonts/ion.woff2
+++ /dev/null
Binary files differ
diff --git a/searx/static/themes/simple/gruntfile.js b/searx/static/themes/simple/gruntfile.js
index f10d00cf3..43f61c0d2 100644
--- a/searx/static/themes/simple/gruntfile.js
+++ b/searx/static/themes/simple/gruntfile.js
@@ -8,8 +8,8 @@ module.exports = function(grunt) {
pkg: grunt.file.readJSON('package.json'),
watch: {
scripts: {
- files: ['src/**'],
- tasks: ['eslint', 'copy', 'concat', 'uglify', 'htmlmin', 'less:development', 'less:production']
+ files: ['gruntfile.js', 'src/**'],
+ tasks: ['eslint', 'copy', 'concat', 'svg2jinja', 'uglify', 'htmlmin', 'less:development', 'less:production']
}
},
eslint: {
@@ -106,70 +106,6 @@ module.exports = function(grunt) {
}
}
},
- webfont: {
- icons: {
- // src: 'node_modules/ionicons-npm/src/*.svg',
- src: [
- 'node_modules/ionicons-npm/src/navicon-round.svg',
- 'node_modules/ionicons-npm/src/search.svg',
- 'node_modules/ionicons-npm/src/play.svg',
- 'node_modules/ionicons-npm/src/link.svg',
- 'node_modules/ionicons-npm/src/chevron-up.svg',
- 'node_modules/ionicons-npm/src/chevron-left.svg',
- 'node_modules/ionicons-npm/src/chevron-right.svg',
- 'node_modules/ionicons-npm/src/arrow-down-a.svg',
- 'node_modules/ionicons-npm/src/arrow-up-a.svg',
- 'node_modules/ionicons-npm/src/arrow-swap.svg',
- 'node_modules/ionicons-npm/src/telephone.svg',
- 'node_modules/ionicons-npm/src/android-arrow-dropdown.svg',
- 'node_modules/ionicons-npm/src/android-globe.svg',
- 'node_modules/ionicons-npm/src/android-time.svg',
- 'node_modules/ionicons-npm/src/location.svg',
- 'node_modules/ionicons-npm/src/alert-circled.svg',
- 'node_modules/ionicons-npm/src/android-alert.svg',
- 'node_modules/ionicons-npm/src/ios-film-outline.svg',
- 'node_modules/ionicons-npm/src/music-note.svg',
- 'node_modules/ionicons-npm/src/ion-close-round.svg',
- 'node_modules/ionicons-npm/src/android-more-vertical.svg',
- 'src/fonts/magnet.svg',
- 'node_modules/ionicons-npm/src/android-close.svg',
- ],
- dest: 'fonts',
- destLess: 'src/generated',
- options: {
- font: 'ion',
- hashes : true,
- syntax: 'bem',
- styles : 'font,icon',
- types : 'eot,woff2,woff,ttf,svg',
- order : 'eot,woff2,woff,ttf,svg',
- stylesheets : ['css', 'less'],
- relativeFontPath : '../fonts/',
- autoHint : false,
- normalize : false,
- // ligatures : true,
- optimize : true,
- // fontHeight : 400,
- rename : function(name) {
- basename = path.basename(name);
- if (basename === 'android-alert.svg') {
- return 'error.svg';
- }
- if (basename === 'alert-circled.svg') {
- return 'warning.svg';
- }
- if (basename === 'ion-close-round.svg') {
- return 'close.svg';
- }
- return basename.replace(/(ios|md|android)-/i, '');
- },
- templateOptions: {
- baseClass: 'ion-icon',
- classPrefix: 'ion-'
- }
- }
- }
- },
less: {
development: {
options: {
@@ -197,6 +133,89 @@ module.exports = function(grunt) {
}
},
},
+ svg2jinja: {
+ all: {
+ src: {
+ 'warning': 'node_modules/ionicons/dist/svg/alert-outline.svg',
+ 'close': 'node_modules/ionicons/dist/svg/close-outline.svg',
+ 'chevron-up-outline': 'node_modules/ionicons/dist/svg/chevron-up-outline.svg',
+ 'chevron-right': 'node_modules/ionicons/dist/svg/chevron-forward-outline.svg',
+ 'chevron-left': 'node_modules/ionicons/dist/svg/chevron-back-outline.svg',
+ 'menu-outline': 'node_modules/ionicons/dist/svg/menu-outline.svg',
+ 'ellipsis-vertical-outline': 'node_modules/ionicons/dist/svg/ellipsis-vertical-outline.svg',
+ 'magnet-outline': 'node_modules/ionicons/dist/svg/magnet-outline.svg',
+ 'globe-outline': 'node_modules/ionicons/dist/svg/globe-outline.svg',
+ 'search-outline': 'node_modules/ionicons/dist/svg/search-outline.svg',
+ 'image-outline': 'node_modules/ionicons/dist/svg/image-outline.svg',
+ 'play-outline': 'node_modules/ionicons/dist/svg/play-outline.svg',
+ 'newspaper-outline': 'node_modules/ionicons/dist/svg/newspaper-outline.svg',
+ 'location-outline': 'node_modules/ionicons/dist/svg/location-outline.svg',
+ 'musical-notes-outline': 'node_modules/ionicons/dist/svg/musical-notes-outline.svg',
+ 'layers-outline': 'node_modules/ionicons/dist/svg/layers-outline.svg',
+ 'school-outline': 'node_modules/ionicons/dist/svg/school-outline.svg',
+ 'file-tray-full-outline': 'node_modules/ionicons/dist/svg/file-tray-full-outline.svg',
+ 'people-outline': 'node_modules/ionicons/dist/svg/people-outline.svg',
+ },
+ dest: '../../../templates/simple/icons.html',
+ },
+ },
+ });
+
+
+ grunt.registerMultiTask('svg2jinja', 'Create Jinja2 macro', function() {
+ const ejs = require('ejs'), svgo = require('svgo');
+ const icons = {}
+ for(const iconName in this.data.src) {
+ const svgFileName = this.data.src[iconName];
+ try {
+ const svgContent = grunt.file.read(svgFileName, { encoding: 'utf8' })
+ const svgoResult = svgo.optimize(svgContent, {
+ path: svgFileName,
+ multipass: true,
+ plugins: [
+ {
+ name: "removeTitle",
+ },
+ {
+ name: "removeXMLNS",
+ },
+ {
+ name: "addAttributesToSVGElement",
+ params: {
+ attributes: [
+ { "aria-hidden": "true" }
+ ]
+ }
+ }
+ ]
+ });
+ icons[iconName] = svgoResult.data.replace("'", "\\'");
+ } catch (err) {
+ grunt.log.error(err);
+ }
+ }
+ const template = `{# this file was generated by searx/static/themes/simple/gruntfile.js #}
+{%- set icons = {
+<% for (const iconName in icons) { %> '<%- iconName %>':'<%- icons[iconName] %>',
+<% } %>
+}
+-%}
+
+{% macro icon(action, alt) -%}
+ {{ icons[action] | replace("ionicon", "ion-icon") | safe }}
+{%- endmacro %}
+
+{% macro icon_small(action) -%}
+ {{ icons[action] | replace("ionicon", "ion-icon-small") | safe }}
+{%- endmacro %}
+
+{% macro icon_big(action, alt) -%}
+ {{ icons[action] | replace("ionicon", "ion-icon-big") | safe }}
+{%- endmacro %}
+`;
+ const result = ejs.render(template, { icons });
+ grunt.file.write(this.data.dest, result, { encoding: 'utf8' });
+ grunt.log.ok(this.data.dest + " created");
});
grunt.loadNpmTasks('grunt-contrib-watch');
@@ -207,7 +226,6 @@ module.exports = function(grunt) {
grunt.loadNpmTasks('grunt-contrib-concat');
grunt.loadNpmTasks('grunt-contrib-less');
grunt.loadNpmTasks('grunt-contrib-cssmin');
- grunt.loadNpmTasks('grunt-webfont');
grunt.loadNpmTasks('grunt-stylelint');
grunt.loadNpmTasks('grunt-eslint');
@@ -218,6 +236,7 @@ module.exports = function(grunt) {
'stylelint',
'copy',
'concat',
+ 'svg2jinja',
'uglify',
'htmlmin',
'less:development',
diff --git a/searx/static/themes/simple/package.json b/searx/static/themes/simple/package.json
index 4ef608db7..3676672bd 100644
--- a/searx/static/themes/simple/package.json
+++ b/searx/static/themes/simple/package.json
@@ -1,9 +1,9 @@
{
"devDependencies": {
- "grunt-cli": "^1.4.3",
+ "eslint": "^8.0.1",
"grunt": "~1.4.1",
- "grunt-contrib-copy": "^1.0.0",
"grunt-contrib-concat": "~2.0.0",
+ "grunt-contrib-copy": "^1.0.0",
"grunt-contrib-cssmin": "^4.0.0",
"grunt-contrib-jshint": "~3.1.1",
"grunt-contrib-less": "~3.0.0",
@@ -11,15 +11,15 @@
"grunt-xmlmin": "~0.1.8",
"grunt-contrib-htmlmin": "~3.1.0",
"grunt-contrib-watch": "~1.1.0",
- "grunt-stylelint": "^0.16.0",
"grunt-eslint": "^23.0.0",
- "grunt-webfont": "^1.7.2",
- "ionicons-npm": "^2.0.1",
- "eslint": "^8.0.1",
+ "grunt-stylelint": "^0.16.0",
+ "ionicons": "^5.5.4",
"less": "^4.1.1",
"less-plugin-clean-css": "^1.5.1",
"stylelint": "^13.13.1",
- "stylelint-config-standard": "^22.0.0"
+ "stylelint-config-standard": "^22.0.0",
+ "ejs": "^3.1.6",
+ "svgo": "^2.8.0"
},
"dependencies": {
"autocomplete-js": "2.7.1",
diff --git a/searx/static/themes/simple/src/fonts/magnet.svg b/searx/static/themes/simple/src/fonts/magnet.svg
deleted file mode 100644
index 1a1defdb8..000000000
--- a/searx/static/themes/simple/src/fonts/magnet.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" width="31mm" height="44mm" viewBox="0 0 31 44" version="1.1"><metadata><rdf:RDF><cc:Work><dc:format>image/svg+xml</dc:format><dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/><dc:title/><cc:license rdf:resource="https://www.gnu.org/licenses/agpl-3.0.en.html"/><dc:creator><cc:Agent><dc:title>Alexandre Flament</dc:title></cc:Agent></dc:creator></cc:Work></rdf:RDF></metadata><g fill="#000"><path d="M2.381 28.39H9.79v5.82H2.38z" stroke-width=".049"/><path d="M15.872 10.398c2.381 0 5.82.264 5.82 3.704v12.17c2.47.055 4.94-.001 7.41 0 .02-4.371 0-8.73 0-12.964-.022-3.73-1.158-6.05-3.705-7.937-2.844-2.203-6.144-2.335-9.656-2.347-3.512.012-6.812.144-9.656 2.347-2.547 1.887-3.683 4.207-3.704 7.937 0 4.234-.02 8.593 0 12.965 2.47-.002 4.94.054 7.409 0v-12.17c0-3.44 3.44-3.705 5.82-3.705" stroke="#000" stroke-width=".063" stroke-linecap="butt" stroke-linejoin="miter" stroke-opacity="1"/><path d="M21.696 28.39h7.408v5.82h-7.408z" stroke-width=".049"/></g></svg>
diff --git a/searx/static/themes/simple/src/generated/ion.less b/searx/static/themes/simple/src/generated/ion.less
deleted file mode 100644
index 67158206f..000000000
--- a/searx/static/themes/simple/src/generated/ion.less
+++ /dev/null
@@ -1,181 +0,0 @@
-// 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/search.less b/searx/static/themes/simple/src/less/search.less
index b4818ba5d..99aa02a34 100644
--- a/searx/static/themes/simple/src/less/search.less
+++ b/searx/static/themes/simple/src/less/search.less
@@ -16,6 +16,40 @@
"spacer categories";
}
+.category {
+ display: inline-block;
+ position: relative;
+ margin-right: 1rem;
+ padding: 0;
+
+ input {
+ display: none;
+ }
+
+ label {
+ svg {
+ padding-right: 0.2rem;
+ }
+
+ cursor: pointer;
+ padding: 0.2rem 0;
+ display: inline-flex;
+ text-transform: capitalize;
+ font-size: 0.9em;
+ border-bottom: 2px solid transparent;
+ .disable-user-select;
+
+ div.category_name {
+ margin: auto 0;
+ }
+ }
+
+ input[type="checkbox"]:checked + label {
+ color: var(--color-categories-item-selected-font);
+ border-bottom: 2px solid var(--color-categories-item-border-selected);
+ }
+}
+
#search_logo {
grid-area: logo;
display: flex;
@@ -79,7 +113,7 @@
border-collapse: separate;
box-sizing: border-box;
margin: 0;
- padding: 8px;
+ padding: 10px;
background: none repeat scroll 0 0 var(--color-search-background);
border: 1px solid var(--color-search-border);
border-radius: 0;
@@ -156,7 +190,6 @@
#categories {
width: 100%;
- margin: 0;
text-align: left;
overflow-x: scroll;
overflow-y: hidden;
@@ -188,7 +221,7 @@
}
.search_box {
- // hack, should bew 100% ?
+ // hack, should be 100% ?
width: 99%;
margin: 0.1em;
padding: 0 0.1em 0 0;
@@ -219,9 +252,15 @@
.category {
display: block;
width: 100%;
+ margin: 0;
label {
- padding: 10px !important;
+ padding: 0.8rem !important;
+ margin: 0 !important;
+
+ svg {
+ display: none;
+ }
}
}
}
@@ -239,7 +278,6 @@
}
#categories {
- margin: 0 10px 0 0;
.disable-user-select;
&::-webkit-scrollbar {
@@ -248,33 +286,6 @@
}
}
-.category {
- display: inline-block;
- position: relative;
- margin: 0 3px;
- padding: 0;
-
- input {
- display: none;
- }
-
- label {
- cursor: pointer;
- padding: 0.3rem 0.75rem 0.5rem 0.75rem;
- margin: 0;
- display: block;
- text-transform: capitalize;
- font-size: 0.9em;
- border-bottom: 2px solid transparent;
- .disable-user-select;
- }
-
- input[type="checkbox"]:checked + label {
- color: var(--color-categories-item-selected-font);
- border-bottom: 2px solid var(--color-categories-item-border-selected);
- }
-}
-
#categories_container {
position: relative;
}
diff --git a/searx/static/themes/simple/src/less/style.less b/searx/static/themes/simple/src/less/style.less
index b93317fa3..a26c57db1 100644
--- a/searx/static/themes/simple/src/less/style.less
+++ b/searx/static/themes/simple/src/less/style.less
@@ -10,7 +10,6 @@
@import "../../__common__/less/stats.less";
@import "../../__common__/less/result_templates.less";
@import (inline) "../../node_modules/normalize.css/normalize.css";
-@import "../generated/ion.less";
@import "definitions.less";
@import "mixins.less";
@import "code.less";
@@ -28,10 +27,23 @@
@import "search.less";
// ion-icon
-.ion-icon-big {
+.ion-icon {
+ display: inline-block;
+ vertical-align: bottom;
+ line-height: 1;
+ text-decoration: inherit;
+}
+
+.ion-icon-small {
+ width: 1rem;
+ height: 1rem;
.ion-icon;
+}
- font-size: 149%;
+.ion-icon-big {
+ width: 1.5rem;
+ height: 1.5rem;
+ .ion-icon;
}
// Main LESS-Code
@@ -530,7 +542,7 @@ article[data-vim-selected].category-social {
#linkto_preferences {
position: absolute;
right: 10px;
- top: 2rem;
+ top: 2.2rem;
padding: 0;
border: 0;
display: block;
diff --git a/searx/static/themes/simple/src/less/toolkit.less b/searx/static/themes/simple/src/less/toolkit.less
index f11275576..195cd9af4 100644
--- a/searx/static/themes/simple/src/less/toolkit.less
+++ b/searx/static/themes/simple/src/less/toolkit.less
@@ -121,20 +121,13 @@ div.selectable_url {
// dialog
.dialog() {
position: relative;
- padding: 1em 1em 1em 2.7em;
+ display: flex;
+ padding: 1rem;
margin: 0 0 1em 0;
border: 1px solid var(--color-toolkit-dialog-border);
text-align: left;
.rounded-corners;
- &::before {
- position: absolute;
- top: 0.5em;
- left: 0.5em;
- font-family: "ion"; // stylelint-disable font-family-no-missing-generic-family-keyword
- font-size: 1.5em;
- }
-
.close {
float: right;
position: relative;
@@ -177,7 +170,6 @@ div.selectable_url {
color: var(--color-error);
background: var(--color-error-background);
border-color: var(--color-error);
- .ion-error();
}
.dialog-warning {
@@ -186,7 +178,6 @@ div.selectable_url {
color: var(--color-warning);
background: var(--color-warning-background);
border-color: var(--color-warning);
- .ion-warning();
}
.dialog-modal {
diff --git a/searx/templates/simple/categories.html b/searx/templates/simple/categories.html
index 0c121eaed..71fdca90a 100644
--- a/searx/templates/simple/categories.html
+++ b/searx/templates/simple/categories.html
@@ -1,7 +1,25 @@
+{% from 'simple/icons.html' import icon_big %}
+{%- set category_icons = {
+ 'general': 'search-outline',
+ 'images': 'image-outline',
+ 'videos': 'play-outline',
+ 'news': 'newspaper-outline',
+ 'map': 'location-outline',
+ 'music': 'musical-notes-outline',
+ 'it': 'layers-outline',
+ 'science': 'school-outline',
+ 'files': 'file-tray-full-outline',
+ 'social media': 'people-outline',
+} -%}
<div id="categories" class="search_categories">{{- '' -}}
<div id="categories_container">
{%- for category in categories -%}
- <div class="category"><input type="checkbox" id="checkbox_{{ category|replace(' ', '_') }}" name="category_{{ category }}"{% if category in selected_categories %} checked="checked"{% endif %}/><label for="checkbox_{{ category|replace(' ', '_') }}" class="tooltips">{{ _(category) }}</label></div>
+ <div class="category"><input type="checkbox" id="checkbox_{{ category|replace(' ', '_') }}" name="category_{{ category }}"{% if category in selected_categories %} checked="checked"{% endif %}/>
+ <label for="checkbox_{{ category|replace(' ', '_') }}" class="tooltips">
+ {{- icon_big(category_icons[category]) if category in category_icons else icon_big('globe-outline') -}}
+ <div class="category_name">{{- _(category) -}}</div>
+ </label>
+ </div>
{%- endfor -%}
{%- if display_tooltip %}<div class="help">{{ _('Click on the magnifier to perform search') }}</div>{% endif -%}
</div>{{- '' -}}
diff --git a/searx/templates/simple/icons.html b/searx/templates/simple/icons.html
new file mode 100644
index 000000000..ffd5041ca
--- /dev/null
+++ b/searx/templates/simple/icons.html
@@ -0,0 +1,36 @@
+{# this file was generated by searx/static/themes/simple/gruntfile.js #}
+{%- set icons = {
+ 'warning':'<svg class="ionicon" viewBox="0 0 512 512" aria-hidden="true"><path d="M256 80c-8.66 0-16.58 7.36-16 16l8 216a8 8 0 008 8h0a8 8 0 008-8l8-216c.58-8.64-7.34-16-16-16z" fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="32"/><circle cx="256" cy="416" r="16" fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="32"/></svg>',
+ 'close':'<svg class="ionicon" viewBox="0 0 512 512" aria-hidden="true"><path fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="32" d="M368 368L144 144M368 144L144 368"/></svg>',
+ 'chevron-up-outline':'<svg class="ionicon" viewBox="0 0 512 512" aria-hidden="true"><path fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="48" d="M112 328l144-144 144 144"/></svg>',
+ 'chevron-right':'<svg class="ionicon" viewBox="0 0 512 512" aria-hidden="true"><path fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="48" d="M184 112l144 144-144 144"/></svg>',
+ 'chevron-left':'<svg class="ionicon" viewBox="0 0 512 512" aria-hidden="true"><path fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="48" d="M328 112L184 256l144 144"/></svg>',
+ 'menu-outline':'<svg class="ionicon" viewBox="0 0 512 512" aria-hidden="true"><path fill="none" stroke="currentColor" stroke-linecap="round" stroke-miterlimit="10" stroke-width="32" d="M80 160h352M80 256h352M80 352h352"/></svg>',
+ 'ellipsis-vertical-outline':'<svg class="ionicon" viewBox="0 0 512 512" aria-hidden="true"><circle cx="256" cy="256" r="32" fill="none" stroke="currentColor" stroke-miterlimit="10" stroke-width="32"/><circle cx="256" cy="416" r="32" fill="none" stroke="currentColor" stroke-miterlimit="10" stroke-width="32"/><circle cx="256" cy="96" r="32" fill="none" stroke="currentColor" stroke-miterlimit="10" stroke-width="32"/></svg>',
+ 'magnet-outline':'<svg class="ionicon" viewBox="0 0 512 512" aria-hidden="true"><path d="M421.83 293.82A144 144 0 00218.18 90.17M353.94 225.94a48 48 0 00-67.88-67.88" fill="none" stroke="currentColor" stroke-miterlimit="10" stroke-width="32"/><path stroke="currentColor" stroke-linecap="round" stroke-miterlimit="10" stroke-width="32" d="M192 464v-48M90.18 421.82l33.94-33.94M48 320h48"/><path d="M286.06 158.06L172.92 271.19a32 32 0 01-45.25 0L105 248.57a32 32 0 010-45.26L218.18 90.17M421.83 293.82L308.69 407a32 32 0 01-45.26 0l-22.62-22.63a32 32 0 010-45.26l113.13-113.17M139.6 169.98l67.88 67.89M275.36 305.75l67.89 67.88" fill="none" stroke="currentColor" stroke-linejoin="round" stroke-width="32"/></svg>',
+ 'globe-outline':'<svg class="ionicon" viewBox="0 0 512 512" aria-hidden="true"><path d="M256 48C141.13 48 48 141.13 48 256s93.13 208 208 208 208-93.13 208-208S370.87 48 256 48z" fill="none" stroke="currentColor" stroke-miterlimit="10" stroke-width="32"/><path d="M256 48c-58.07 0-112.67 93.13-112.67 208S197.93 464 256 464s112.67-93.13 112.67-208S314.07 48 256 48z" fill="none" stroke="currentColor" stroke-miterlimit="10" stroke-width="32"/><path d="M117.33 117.33c38.24 27.15 86.38 43.34 138.67 43.34s100.43-16.19 138.67-43.34M394.67 394.67c-38.24-27.15-86.38-43.34-138.67-43.34s-100.43 16.19-138.67 43.34" fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="32"/><path fill="none" stroke="currentColor" stroke-miterlimit="10" stroke-width="32" d="M256 48v416M464 256H48"/></svg>',
+ 'search-outline':'<svg class="ionicon" viewBox="0 0 512 512" aria-hidden="true"><path d="M221.09 64a157.09 157.09 0 10157.09 157.09A157.1 157.1 0 00221.09 64z" fill="none" stroke="currentColor" stroke-miterlimit="10" stroke-width="32"/><path fill="none" stroke="currentColor" stroke-linecap="round" stroke-miterlimit="10" stroke-width="32" d="M338.29 338.29L448 448"/></svg>',
+ 'image-outline':'<svg class="ionicon" viewBox="0 0 512 512" aria-hidden="true"><rect x="48" y="80" width="416" height="352" rx="48" ry="48" fill="none" stroke="currentColor" stroke-linejoin="round" stroke-width="32"/><circle cx="336" cy="176" r="32" fill="none" stroke="currentColor" stroke-miterlimit="10" stroke-width="32"/><path d="M304 335.79l-90.66-90.49a32 32 0 00-43.87-1.3L48 352M224 432l123.34-123.34a32 32 0 0143.11-2L464 368" fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="32"/></svg>',
+ 'play-outline':'<svg class="ionicon" viewBox="0 0 512 512" aria-hidden="true"><path d="M112 111v290c0 17.44 17 28.52 31 20.16l247.9-148.37c12.12-7.25 12.12-26.33 0-33.58L143 90.84c-14-8.36-31 2.72-31 20.16z" fill="none" stroke="currentColor" stroke-miterlimit="10" stroke-width="32"/></svg>',
+ 'newspaper-outline':'<svg class="ionicon" viewBox="0 0 512 512" aria-hidden="true"><path d="M368 415.86V72a24.07 24.07 0 00-24-24H72a24.07 24.07 0 00-24 24v352a40.12 40.12 0 0040 40h328" fill="none" stroke="currentColor" stroke-linejoin="round" stroke-width="32"/><path d="M416 464h0a48 48 0 01-48-48V128h72a24 24 0 0124 24v264a48 48 0 01-48 48z" fill="none" stroke="currentColor" stroke-linejoin="round" stroke-width="32"/><path fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="32" d="M240 128h64M240 192h64M112 256h192M112 320h192M112 384h192"/><path d="M176 208h-64a16 16 0 01-16-16v-64a16 16 0 0116-16h64a16 16 0 0116 16v64a16 16 0 01-16 16z"/></svg>',
+ 'location-outline':'<svg class="ionicon" viewBox="0 0 512 512" aria-hidden="true"><path d="M256 48c-79.5 0-144 61.39-144 137 0 87 96 224.87 131.25 272.49a15.77 15.77 0 0025.5 0C304 409.89 400 272.07 400 185c0-75.61-64.5-137-144-137z" fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="32"/><circle cx="256" cy="192" r="48" fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="32"/></svg>',
+ 'musical-notes-outline':'<svg class="ionicon" viewBox="0 0 512 512" aria-hidden="true"><path d="M192 218v-6c0-14.84 10-27 24.24-30.59l174.59-46.68A20 20 0 01416 154v22" fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="32"/><path d="M416 295.94v80c0 13.91-8.93 25.59-22 30l-22 8c-25.9 8.72-52-10.42-52-38h0a33.37 33.37 0 0123-32l51-18.15c13.07-4.4 22-15.94 22-29.85V58a10 10 0 00-12.6-9.61L204 102a16.48 16.48 0 00-12 16v226c0 13.91-8.93 25.6-22 30l-52 18c-13.88 4.68-22 17.22-22 32h0c0 27.58 26.52 46.55 52 38l22-8c13.07-4.4 22-16.08 22-30v-80" fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="32"/></svg>',
+ 'layers-outline':'<svg class="ionicon" viewBox="0 0 512 512" aria-hidden="true"><path d="M434.8 137.65l-149.36-68.1c-16.19-7.4-42.69-7.4-58.88 0L77.3 137.65c-17.6 8-17.6 21.09 0 29.09l148 67.5c16.89 7.7 44.69 7.7 61.58 0l148-67.5c17.52-8 17.52-21.1-.08-29.09zM160 308.52l-82.7 37.11c-17.6 8-17.6 21.1 0 29.1l148 67.5c16.89 7.69 44.69 7.69 61.58 0l148-67.5c17.6-8 17.6-21.1 0-29.1l-79.94-38.47" fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="32"/><path d="M160 204.48l-82.8 37.16c-17.6 8-17.6 21.1 0 29.1l148 67.49c16.89 7.7 44.69 7.7 61.58 0l148-67.49c17.7-8 17.7-21.1.1-29.1L352 204.48" fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="32"/></svg>',
+ 'school-outline':'<svg class="ionicon" viewBox="0 0 512 512" aria-hidden="true"><path fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="32" d="M32 192L256 64l224 128-224 128L32 192z"/><path fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="32" d="M112 240v128l144 80 144-80V240M480 368V192M256 320v128"/></svg>',
+ 'file-tray-full-outline':'<svg class="ionicon" viewBox="0 0 512 512" aria-hidden="true"><path d="M384 80H128c-26 0-43 14-48 40L48 272v112a48.14 48.14 0 0048 48h320a48.14 48.14 0 0048-48V272l-32-152c-5-27-23-40-48-40z" fill="none" stroke="currentColor" stroke-linejoin="round" stroke-width="32"/><path fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="32" d="M48 272h144M320 272h144M192 272a64 64 0 00128 0M144 144h224M128 208h256"/></svg>',
+ 'people-outline':'<svg class="ionicon" viewBox="0 0 512 512" aria-hidden="true"><path d="M402 168c-2.93 40.67-33.1 72-66 72s-63.12-31.32-66-72c-3-42.31 26.37-72 66-72s69 30.46 66 72z" fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="32"/><path d="M336 304c-65.17 0-127.84 32.37-143.54 95.41-2.08 8.34 3.15 16.59 11.72 16.59h263.65c8.57 0 13.77-8.25 11.72-16.59C463.85 335.36 401.18 304 336 304z" fill="none" stroke="currentColor" stroke-miterlimit="10" stroke-width="32"/><path d="M200 185.94c-2.34 32.48-26.72 58.06-53 58.06s-50.7-25.57-53-58.06C91.61 152.15 115.34 128 147 128s55.39 24.77 53 57.94z" fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="32"/><path d="M206 306c-18.05-8.27-37.93-11.45-59-11.45-52 0-102.1 25.85-114.65 76.2-1.65 6.66 2.53 13.25 9.37 13.25H154" fill="none" stroke="currentColor" stroke-linecap="round" stroke-miterlimit="10" stroke-width="32"/></svg>',
+
+}
+-%}
+
+{% macro icon(action, alt) -%}
+ {{ icons[action] | replace("ionicon", "ion-icon") | safe }}
+{%- endmacro %}
+
+{% macro icon_small(action) -%}
+ {{ icons[action] | replace("ionicon", "ion-icon-small") | safe }}
+{%- endmacro %}
+
+{% macro icon_big(action, alt) -%}
+ {{ icons[action] | replace("ionicon", "ion-icon-big") | safe }}
+{%- endmacro %}
diff --git a/searx/templates/simple/index.html b/searx/templates/simple/index.html
index 8a017694e..1e4ea0c48 100644
--- a/searx/templates/simple/index.html
+++ b/searx/templates/simple/index.html
@@ -1,10 +1,10 @@
{% extends "simple/base.html" %}
-{% from 'simple/macros.html' import icon %}
+{% from 'simple/icons.html' import icon_big %}
{% block meta %}
<link rel="preload" href="{{ url_for('static', filename='img/searxng.png') }}" as="image" />
{% endblock %}
{% block content %}
-<nav id="linkto_preferences"><a href="{{ url_for('preferences') }}">{{ icon('navicon-round') }}</a></nav>
+<nav id="linkto_preferences"><a href="{{ url_for('preferences') }}">{{ icon_big('menu-outline') }}</a></nav>
<div class="index">
<div class="title"><h1>SearXNG</h1></div>
{% include 'simple/simple_search.html' %}
diff --git a/searx/templates/simple/macros.html b/searx/templates/simple/macros.html
index 92c6c9ef2..26aa71891 100644
--- a/searx/templates/simple/macros.html
+++ b/searx/templates/simple/macros.html
@@ -1,12 +1,3 @@
-<!-- Draw glyphicon icon from bootstrap-theme -->
-{% macro icon(action, alt) -%}
- <span title="{{ alt }}" class="ion-icon-big ion-{{ action }}"></span>
-{%- endmacro %}
-
-{% macro icon_small(action) -%}
- <span class="ion-icon ion-{{ action }}"></span>
-{%- endmacro %}
-
<!-- Draw favicon -->
{% macro draw_favicon(favicon) -%}
<img width="14" height="14" class="favicon" src="{{ url_for('static', filename='themes/simple/img/icons/' + favicon + '.png') }}" alt="{{ favicon }}" />
@@ -43,7 +34,7 @@
{%- macro result_sub_footer(result, proxify) -%}
<div class="engines">
{% for engine in result.engines %}<span>{{ engine }}</span>{% endfor %}
- {{ result_link("https://web.archive.org/web/" + result.url, icon('link') + _('cached'), "cache_link") }}&lrm; {% if proxify and proxify_results %} {{ result_link(proxify(result.url), icon('link') + _('proxied'), "proxyfied_link") }} {% endif %}
+ {{ result_link("https://web.archive.org/web/" + result.url, icon_small('ellipsis-vertical-outline') + _('cached'), "cache_link") }}&lrm; {% if proxify and proxify_results %} {{ result_link(proxify(result.url), icon('link') + _('proxied'), "proxyfied_link") }} {% endif %}
</div>{{- '' -}}
<div class="break"></div>{{- '' -}}
{%- endmacro -%}
diff --git a/searx/templates/simple/messages/no_results.html b/searx/templates/simple/messages/no_results.html
index a3ab97758..b98f834e6 100644
--- a/searx/templates/simple/messages/no_results.html
+++ b/searx/templates/simple/messages/no_results.html
@@ -1,17 +1,19 @@
-{% from 'simple/macros.html' import icon %}
+{% from 'simple/icons.html' import icon_big %}
{% if unresponsive_engines %}
<div class="dialog-error" role="alert">
- <p><strong>{{ _('Error!') }}</strong> {{ _('Engines cannot retrieve results.') }}</p>
- {% for engine_name, error_type in unresponsive_engines %}
- <p>{{- '' -}}
- {{- engine_name }} (
+ {{ icon_big('warning') }}
+ <div>
+ <p><strong>{{ _('Error!') }}</strong> {{ _('Engines cannot retrieve results.') }}</p>
+ {% for engine_name, error_type in unresponsive_engines %}
+ <p>{{- '' -}}
+ {{- engine_name }} (
<a href="{{ url_for('stats', engine=engine_name|e) }}" title="{{ _('View error logs and submit a bug report') }}">
- {{- error_type -}}
+ {{- error_type -}}
</a> ){{- '' -}}
- </p>
- {%- endfor %}
-
- <p><small>{{ _('Please, try again later or find another SearXNG instance.') }} (<a href="{{ get_setting('brand.public_instances') }}">{{ _('Public instances') }}</a>) </small></p>
+ </p>
+ {%- endfor %}
+ <p><small>{{ _('Please, try again later or find another SearXNG instance.') }} (<a href="{{ get_setting('brand.public_instances') }}">{{ _('Public instances') }}</a>) </small></p>
+ </div>
</div>
{% else %}
<div class="dialog-error" role="alert">
diff --git a/searx/templates/simple/preferences.html b/searx/templates/simple/preferences.html
index 90d01d2b6..267dd6e14 100644
--- a/searx/templates/simple/preferences.html
+++ b/searx/templates/simple/preferences.html
@@ -1,4 +1,5 @@
-{% from 'simple/macros.html' import icon, tabs_open, tabs_close, tab_header, tab_footer, checkbox_onoff, checkbox %}
+{% from 'simple/macros.html' import tabs_open, tabs_close, tab_header, tab_footer, checkbox_onoff, checkbox %}
+{% from 'simple/icons.html' import icon_big %}
{% extends "simple/base.html" %}
@@ -25,7 +26,7 @@
<p class="engine-description"></p>
<p><a href="{{about.website}}" rel="noreferrer">{{about.website}}</a></p>
{%- if about.wikidata_id -%}<p><a href="https://www.wikidata.org/wiki/{{about.wikidata_id}}" rel="noreferrer">wikidata.org/wiki/{{about.wikidata_id}}</a></p>{%- endif -%}
- {%- if search_engine.enable_http %}<p>{{ icon('exclamation-sign', 'No HTTPS') }}{{ _('No HTTPS')}}</p>{% endif -%}
+ {%- if search_engine.enable_http %}<p>{{ icon_big('exclamation-sign', 'No HTTPS') }}{{ _('No HTTPS')}}</p>{% endif -%}
{%- if reliabilities.get(search_engine.name, {}).errors or reliabilities.get(search_engine.name, {}).checker -%}
<a href="{{ url_for('stats', engine=search_engine.name|e) }}" title="{{ _('View error logs and submit a bug report') }}">
{{ _('View error logs and submit a bug report') }}
@@ -74,7 +75,7 @@
<td class="{{ label }} column-reliability">{{- "" -}}
<a href="{{ url_for('stats', engine=engine_name|e) }}">{{- "" -}}
<span aria-labelledby="{{engine_name}}_reliability">
- {{ icon('warning', 'The engine is not reliabled') }} {{ r -}}
+ {{ icon_big('warning', 'The engine is not reliabled') }} {{ r -}}
</span>{{- "" -}}
</a>{{- "" -}}
<div class="engine-tooltip" role="tooltip" id="{{engine_name}}_reliability">
@@ -263,7 +264,7 @@
{% set engine_id = 'engine_' + search_engine.name|replace(' ', '_') + '__' + categ|replace(' ', '_') %}
<tr>
<td class="engine_checkbox">{{ checkbox_onoff(engine_id, (search_engine.name, categ) in disabled_engines) }}</td>
- <th class="name" data-engine-name="{{ search_engine.name }}">{% if search_engine.enable_http %}{{ icon('warning', 'No HTTPS') }}{% endif %} {{ search_engine.name }} {{ engine_about(search_engine) }}</th>
+ <th class="name" data-engine-name="{{ search_engine.name }}">{% if search_engine.enable_http %}{{ icon_big('warning', 'No HTTPS') }}{% endif %} {{ search_engine.name }} {{ engine_about(search_engine) }}</th>
<td class="shortcut">{{ shortcuts[search_engine.name] }}</td>
<td>{{ checkbox(engine_id + '_supported_languages', supports[search_engine.name]['supports_selected_language'], true, true) }}</td>
<td>{{ checkbox(engine_id + '_safesearch', supports[search_engine.name]['safesearch'], true, true) }}</td>
diff --git a/searx/templates/simple/result_templates/images.html b/searx/templates/simple/result_templates/images.html
index f905cd6d7..82cfcdde5 100644
--- a/searx/templates/simple/result_templates/images.html
+++ b/searx/templates/simple/result_templates/images.html
@@ -5,8 +5,8 @@
</a>{{- "" -}}
<div class="detail">{{- "" -}}
<a class="result-detail-close" href="#">{{ icon('close') }}</a>{{- "" -}}
- <a class="result-detail-previous" href="#">{{ icon_small('chevron-left') }}</a>{{- "" -}}
- <a class="result-detail-next" href="#">{{ icon_small('chevron-right') }}</a>{{- "" -}}
+ <a class="result-detail-previous" href="#">{{ icon('chevron-left') }}</a>{{- "" -}}
+ <a class="result-detail-next" href="#">{{ icon('chevron-right') }}</a>{{- "" -}}
<a class="result-images-source" {% if results_on_new_tab %}target="_blank" rel="noopener noreferrer"{% else %}rel="noreferrer"{% endif %} href="{{ result.img_src }}">
{%- if result.thumbnail_src -%}
<img src="" data-src="{{ image_proxify(result.img_src) }}" alt="{{ result.title|striptags }}">
diff --git a/searx/templates/simple/result_templates/map.html b/searx/templates/simple/result_templates/map.html
index 244483a1d..3492d5d5f 100644
--- a/searx/templates/simple/result_templates/map.html
+++ b/searx/templates/simple/result_templates/map.html
@@ -1,4 +1,5 @@
-{% from 'simple/macros.html' import result_header, result_sub_header, result_sub_footer, result_footer, result_footer_rtl, icon with context %}
+{% from 'simple/macros.html' import result_header, result_sub_header, result_sub_footer, result_footer, result_footer_rtl with context %}
+{% from 'simple/icons.html' import icon_small %}
{{ result_header(result, favicons, image_proxify) -}}
{{- result_sub_header(result) -}}
@@ -39,7 +40,7 @@
</table>
{%- if (result.latitude and result.longitude) or result.boundingbox -%}
- <small> <a class="btn-collapse collapsed searxng_init_map hide_if_nojs" data-target="#result-map-{{ index }}" data-btn-text-collapsed="{{ _('show map') }}" data-btn-text-not-collapsed="{{ _('hide map') }}" data-leaflet-target="osm-map-{{ index }}" data-map-lon="{{ result.longitude }}" data-map-lat="{{ result.latitude }}" {% if result.boundingbox %}data-map-boundingbox='{{ result.boundingbox|tojson|safe }}'{% endif %} {% if result.geojson %}data-map-geojson='{{ result.geojson|tojson|safe }}'{% endif %}>{{ icon( 'globe') }} {{ _('show map') }}</a></small>
+ <small> <a class="btn-collapse collapsed searxng_init_map hide_if_nojs" data-target="#result-map-{{ index }}" data-btn-text-collapsed="{{ _('show map') }}" data-btn-text-not-collapsed="{{ _('hide map') }}" data-leaflet-target="osm-map-{{ index }}" data-map-lon="{{ result.longitude }}" data-map-lat="{{ result.latitude }}" {% if result.boundingbox %}data-map-boundingbox='{{ result.boundingbox|tojson|safe }}'{% endif %} {% if result.geojson %}data-map-geojson='{{ result.geojson|tojson|safe }}'{% endif %}>{{ icon_small( 'globe-outline') }} {{ _('show map') }}</a></small>
{%- endif -%}
{{- result_sub_footer(result, proxify) -}}
diff --git a/searx/templates/simple/result_templates/torrent.html b/searx/templates/simple/result_templates/torrent.html
index ffb51588b..ecca0fdec 100644
--- a/searx/templates/simple/result_templates/torrent.html
+++ b/searx/templates/simple/result_templates/torrent.html
@@ -3,12 +3,12 @@
{{ result_header(result, favicons, image_proxify) -}}
{{- result_sub_header(result) -}}
-{% if result.magnetlink %}<p class="altlink"> &bull; {{ result_link(result.magnetlink, icon('magnet') + _('magnet link'), "magnetlink") }}</p>{% endif %}
-{% if result.torrentfile %}<p class="altlink"> &bull; {{ result_link(result.torrentfile, icon('download-alt') + _('torrent file'), "torrentfile") }}</p>{% endif %}
+{% if result.magnetlink %}<p class="altlink"> &bull; {{ result_link(result.magnetlink, icon_big('magnet-outline') + _('magnet link'), "magnetlink") }}</p>{% endif %}
+{% if result.torrentfile %}<p class="altlink"> &bull; {{ result_link(result.torrentfile, icon_big('download-alt') + _('torrent file'), "torrentfile") }}</p>{% endif %}
-{% if result.seed is defined %}<p class="stat"> &bull; {{ icon('arrow-swap') }} {{ _('Seeder') }} <span class="badge">{{ result.seed }}</span> &bull; {{ _('Leecher') }} <span class="badge">{{ result.leech }}</span></p>{% endif %}
+{% if result.seed is defined %}<p class="stat"> &bull; {{ icon_big('arrow-swap') }} {{ _('Seeder') }} <span class="badge">{{ result.seed }}</span> &bull; {{ _('Leecher') }} <span class="badge">{{ result.leech }}</span></p>{% endif %}
-{%- if result.filesize %}<p class="stat">{{ icon('floppy-disk') }} {{ _('Filesize') }}<span class="badge">
+{%- if result.filesize %}<p class="stat">{{ icon_big('floppy-disk') }} {{ _('Filesize') }}<span class="badge">
{%- if result.filesize < 1024 %}{{ result.filesize }} {{ _('Bytes') }}
{%- elif result.filesize < 1024*1024 %}{{ '{0:0.2f}'.format(result.filesize/1024) }} {{ _('kiB') }}
{%- elif result.filesize < 1024*1024*1024 %}{{ '{0:0.2f}'.format(result.filesize/1024/1024) }} {{ _('MiB') }}
@@ -17,7 +17,7 @@
</span></p>
{%- endif -%}
-{%- if result.files %}<p class="stat">{{ icon('file') }} {{ _('Number of Files') }} <span class="badge">{{ result.files }}</span></p>{% endif -%}
+{%- if result.files %}<p class="stat">{{ icon_big('file') }} {{ _('Number of Files') }} <span class="badge">{{ result.files }}</span></p>{% endif -%}
{%- if result.content %}<p class="content">{{ result.content|safe }}</p>{% endif -%}
{{- result_sub_footer(result, proxify) -}}
diff --git a/searx/templates/simple/results.html b/searx/templates/simple/results.html
index 59874dab3..59de1ee0d 100644
--- a/searx/templates/simple/results.html
+++ b/searx/templates/simple/results.html
@@ -1,5 +1,5 @@
{% extends "simple/base.html" %}
-{% from 'simple/macros.html' import icon, icon_small %}
+{% from 'simple/icons.html' import icon, icon_big, icon_small %}
{% macro engine_data_form(engine_data) -%}
{% for engine_name, kv_data in engine_data.items() %}
{% for k, v in kv_data.items() %}
@@ -10,7 +10,7 @@
{% block title %}{% if method == 'GET' %}{{- q|e -}} -{% endif %}{% endblock %}
{% block meta %}<link rel="alternate" type="application/rss+xml" title="Searx search: {{ q|e }}" href="{{ url_for('search', _external=True) }}?q={{ q|urlencode }}&amp;categories={{ selected_categories|join(",") | replace(' ','+') }}&amp;pageno={{ pageno }}&amp;time_range={{ time_range }}&amp;language={{ current_language }}&amp;safesearch={{ safesearch }}&amp;format=rss">{% endblock %}
{% block content %}
-<nav id="linkto_preferences"><a href="{{ url_for('preferences') }}">{{ icon('navicon-round') }}</a></nav>
+<nav id="linkto_preferences"><a href="{{ url_for('preferences') }}">{{ icon_big('menu-outline') }}</a></nav>
{% include 'simple/search.html' %}
{% if results and results|map(attribute='template')|unique|list|count == 1 %}
@@ -42,14 +42,17 @@
{% if unresponsive_engines and results|length >= 1 %}
<div class="dialog-error" role="alert">
- <p><strong>{{ _('Error!') }}</strong> {{ _('Engines cannot retrieve results') }}:</p>
- {%- for engine_name, error_type in unresponsive_engines -%}
- <p>{{- engine_name }} (
- <a href="{{ url_for('stats', engine=engine_name|e) }}" title="{{ _('View error logs and submit a bug report') }}">
+ {{ icon_big('warning') }}
+ <div>
+ <p><strong>{{ _('Error!') }}</strong> {{ _('Engines cannot retrieve results') }}:</p>
+ {%- for engine_name, error_type in unresponsive_engines -%}
+ <p>{{- engine_name }} (
+ <a href="{{ url_for('stats', engine=engine_name|e) }}" title="{{ _('View error logs and submit a bug report') }}">
{{- error_type -}}
- </a> ){{- '' -}}
- </p>
- {% endfor %}
+ </a> ){{- '' -}}
+ </p>
+ {% endfor %}
+ </div>
</div>
{% endif %}
@@ -141,7 +144,7 @@
{% endif %}
</div>
<div id="backToTop">
- <a href="#">{{ icon_small('chevron-up') }}</a>
+ <a href="#">{{ icon_small('chevron-up-outline') }}</a>
</div>
{% if paging %}
<nav id="pagination">
diff --git a/searx/templates/simple/search.html b/searx/templates/simple/search.html
index 1f410ad96..c231d7b35 100644
--- a/searx/templates/simple/search.html
+++ b/searx/templates/simple/search.html
@@ -6,8 +6,8 @@
<div id="search_wrapper">
<div class="search_box">
<input id="q" autofocus name="q" type="text" placeholder="{{ _('Search for...') }}" tabindex="1" autocomplete="off" spellcheck="false" dir="auto" {% if q %}value="{{ q }}"{% endif %} >
- <button id="clear_search" type="button" tabindex="-1"><span class="hide_if_nojs">{{ icon('close') }}</span><span class="show_if_nojs">{{ _('Clear search') }}</span></button>
- <button id="send_search" type="submit" tabindex="-1"><span class="hide_if_nojs">{{ icon('search') }}</span><span class="show_if_nojs">{{ _('Start search') }}</span></button>
+ <button id="clear_search" type="button" tabindex="-1"><span class="hide_if_nojs">{{ icon_big('close') }}</span><span class="show_if_nojs">{{ _('Clear search') }}</span></button>
+ <button id="send_search" type="submit" tabindex="-1"><span class="hide_if_nojs">{{ icon_big('search-outline') }}</span><span class="show_if_nojs">{{ _('Start search') }}</span></button>
</div>
<div class="search_filters">
{% include 'simple/languages.html' %}
diff --git a/searx/templates/simple/simple_search.html b/searx/templates/simple/simple_search.html
index 3d0e11834..8612ceca6 100644
--- a/searx/templates/simple/simple_search.html
+++ b/searx/templates/simple/simple_search.html
@@ -2,8 +2,8 @@
<div id="search_wrapper">
<div class="search_box">
<input id="q" autofocus name="q" type="text" placeholder="{{ _('Search for...') }}" tabindex="1" autocomplete="off" spellcheck="false" dir="auto" {% if q %}value="{{ q }}"{% endif %} >
- <button id="clear_search" type="button" tabindex="-1"><span class="hide_if_nojs">{{ icon('close') }}</span><span class="show_if_nojs">{{ _('Clear search') }}</span></button>
- <button id="send_search" type="submit" tabindex="-1"><span class="hide_if_nojs">{{ icon('search') }}</span><span class="show_if_nojs">{{ _('Start search') }}</span></button>
+ <button id="clear_search" type="button" tabindex="-1"><span class="hide_if_nojs">{{ icon_big('close') }}</span><span class="show_if_nojs">{{ _('Clear search') }}</span></button>
+ <button id="send_search" type="submit" tabindex="-1"><span class="hide_if_nojs">{{ icon_big('search-outline') }}</span><span class="show_if_nojs">{{ _('Start search') }}</span></button>
</div>
</div>
</form>
diff --git a/searx/templates/simple/stats.html b/searx/templates/simple/stats.html
index c023cfdd2..1e905790a 100644
--- a/searx/templates/simple/stats.html
+++ b/searx/templates/simple/stats.html
@@ -1,4 +1,4 @@
-{% from 'simple/macros.html' import icon %}
+{% from 'simple/icons.html' import icon_big %}
{% from '__common__/new_issue.html' import new_issue with context %}
{% extends "simple/base.html" %}
@@ -7,7 +7,7 @@
{% if selected_engine_name %}
{{ column_name }}
{% elif column_order==sort_order %}
- {{ column_name }} {{ icon('arrow-dropdown') }}
+ {{ column_name }} {{ icon_big('arrow-dropdown') }}
{% else %}
<a href="{{ url_for('stats', sort=column_order) }}">{{ column_name }}</a>
{% endif %}
7apu2bq3rhoylwmucxizk54afw5jyda7pho4j5zdcqpwkufke7zdzwad.onion