From e7c0f4e877dc90fc44989a304b555a8b6f1f6665 Mon Sep 17 00:00:00 2001 From: Martin Fischer Date: Mon, 31 Jan 2022 11:50:20 +0100 Subject: [PATCH 1/4] [simple] link preferences on /about and /stats We want to link the preferences from every page (except of course the preferences page). --- searx/templates/simple/base.html | 4 ++++ searx/templates/simple/index.html | 1 - searx/templates/simple/preferences.html | 1 + searx/templates/simple/results.html | 1 - 4 files changed, 5 insertions(+), 2 deletions(-) diff --git a/searx/templates/simple/base.html b/searx/templates/simple/base.html index 548710310..2bb7d8b2a 100644 --- a/searx/templates/simple/base.html +++ b/searx/templates/simple/base.html @@ -47,6 +47,10 @@ {% endif %} + {% block linkto_preferences %} + {% from 'simple/icons.html' import icon_big %} + + {% endblock %} {% block header %} {% endblock %} {% block content %} diff --git a/searx/templates/simple/index.html b/searx/templates/simple/index.html index 1e4ea0c48..5a83e10a0 100644 --- a/searx/templates/simple/index.html +++ b/searx/templates/simple/index.html @@ -4,7 +4,6 @@ {% endblock %} {% block content %} -

SearXNG

{% include 'simple/simple_search.html' %} diff --git a/searx/templates/simple/preferences.html b/searx/templates/simple/preferences.html index 6b21afee4..b674d5d02 100644 --- a/searx/templates/simple/preferences.html +++ b/searx/templates/simple/preferences.html @@ -94,6 +94,7 @@ {%- endmacro -%} {% block head %} {% endblock %} +{% block linkto_preferences %}{% endblock %} {% block content %}

{{ _('Preferences') }}

diff --git a/searx/templates/simple/results.html b/searx/templates/simple/results.html index b9764addd..4149f83c3 100644 --- a/searx/templates/simple/results.html +++ b/searx/templates/simple/results.html @@ -10,7 +10,6 @@ {% block title %}{% if query_in_title %}{{- q|e }} - {% endif %}{% endblock %} {% block meta %}{% endblock %} {% block content %} - {% include 'simple/search.html' %} {% if results and results|map(attribute='template')|unique|list|count == 1 %} From 743353dd09cd2c0cc29ec30ddd11a2c841f6e6c3 Mon Sep 17 00:00:00 2001 From: Martin Fischer Date: Mon, 31 Jan 2022 12:00:11 +0100 Subject: [PATCH 2/4] [simple] add aria-label to preferences link --- searx/templates/simple/base.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/searx/templates/simple/base.html b/searx/templates/simple/base.html index 2bb7d8b2a..33b7a2cbe 100644 --- a/searx/templates/simple/base.html +++ b/searx/templates/simple/base.html @@ -49,7 +49,7 @@ {% block linkto_preferences %} {% from 'simple/icons.html' import icon_big %} - + {% endblock %} {% block header %} {% endblock %} From b6200563ba772f0565a18fe5ac84cbdf5dc20667 Mon Sep 17 00:00:00 2001 From: Martin Fischer Date: Tue, 1 Feb 2022 06:19:45 +0100 Subject: [PATCH 3/4] [simple] improve margin of #linkto_preferences Co-authored-by: Paul Braeuning --- searx/static/themes/simple/src/less/index.less | 4 ---- searx/static/themes/simple/src/less/style.less | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/searx/static/themes/simple/src/less/index.less b/searx/static/themes/simple/src/less/index.less index 3f1084099..b80d75c8c 100644 --- a/searx/static/themes/simple/src/less/index.less +++ b/searx/static/themes/simple/src/less/index.less @@ -1,9 +1,5 @@ #main_index { margin-top: 26vh; - - #linkto_preferences { - .ltr-right(1.8rem); - } } .index { diff --git a/searx/static/themes/simple/src/less/style.less b/searx/static/themes/simple/src/less/style.less index 4011dddb5..59b74aabe 100644 --- a/searx/static/themes/simple/src/less/style.less +++ b/searx/static/themes/simple/src/less/style.less @@ -576,7 +576,7 @@ article[data-vim-selected].category-social { #linkto_preferences { position: absolute; - .ltr-right(10px); + .ltr-right(1.8rem); top: 2.2rem; padding: 0; border: 0; From e9315903127a254d59a50a5a9e8f7025bc01330a Mon Sep 17 00:00:00 2001 From: Martin Fischer Date: Tue, 1 Feb 2022 06:20:18 +0100 Subject: [PATCH 4/4] [build] /static --- .../themes/simple/css/searxng-rtl.min.css | Bin 57999 -> 57957 bytes .../themes/simple/css/searxng-rtl.min.css.map | Bin 94814 -> 94743 bytes .../static/themes/simple/css/searxng.min.css | Bin 56972 -> 56929 bytes .../themes/simple/css/searxng.min.css.map | Bin 93207 -> 93136 bytes 4 files changed, 0 insertions(+), 0 deletions(-) diff --git a/searx/static/themes/simple/css/searxng-rtl.min.css b/searx/static/themes/simple/css/searxng-rtl.min.css index a3922584677474f9b0a513beacf1fddc08bdb807..359bcd0003012f5b482218cda64ad22abf930afd 100644 GIT binary patch delta 25 hcmeA_%KY>Q^M)H!H?vGTV#BIuQIwjy`ShhD`~afp3_t(? delta 50 zcmV-20L}m9!~>7T1F+bYlRn%a5^QB=bUHCEIC5oeeJ*KkWMz1hF`W~$@s+DQ12AxS Iv!T+&4>%CRq2(%aF|QODnNvxSWgBctKwRNFjhUT=SkEGI`DPq5VF ziE+Y{XL|5#{vV;cbNcN(MtKRnoRT8lqRjM+5)DH=i=xzAP3xFE1%=w}T0)Gg{Fx03 MDz@KDWV90i00+w?rvLx| diff --git a/searx/static/themes/simple/css/searxng.min.css b/searx/static/themes/simple/css/searxng.min.css index bbda942a178140c0c739b42e3270c2b233078474..111a43c3241cb96cbb4f44059acab941ad5a8c2f 100644 GIT binary patch delta 25 hcmeC#%lvQ;^M)H!H?vOLYs0E%QIwjy`RJwN+yJ0^3>*Le delta 51 zcmV-30L=g4yaSBA1F+bYlQ`TU6LM*1XmmO;E;w>!ZGA3jZe(S6lQEqWv+}oF7#T}8m)aIcGx~3S7Qw%HyB-hY3V&8Ti=x!r?Kh(t?F0a& C^$_C# delta 78 zcmca`opt&R)(sXm0CRq2($~?^QODnNvxSWgBctKwRNDe+M(@qnBKSA6#N;U` gOb?7^l$>4