From 6e2b5f3d5ad95fe87fe58734a6730b9ed46ac6c0 Mon Sep 17 00:00:00 2001 From: Alexandre Flament Date: Mon, 13 Jun 2022 21:10:44 +0200 Subject: [PATCH 1/3] Theme: add Help and Donate links in all pages Close https://github.com/searxng/searxng/issues/931 --- searx/infopage/__init__.py | 1 + searx/static/themes/simple/gruntfile.js | 2 + .../static/themes/simple/src/less/style.less | 49 +++++++++++++++++-- .../simple/src/svg/help-circle-outline.svg | 5 ++ searx/templates/simple/base.html | 16 ++++-- searx/templates/simple/info.html | 2 + 6 files changed, 66 insertions(+), 9 deletions(-) create mode 100644 searx/static/themes/simple/src/svg/help-circle-outline.svg diff --git a/searx/infopage/__init__.py b/searx/infopage/__init__.py index 4aebfa5a7..730d50a74 100644 --- a/searx/infopage/__init__.py +++ b/searx/infopage/__init__.py @@ -134,6 +134,7 @@ class InfoPageSet: # pylint: disable=too-few-public-methods self.toc: typing.List[str] = [ 'search-syntax', 'about', + 'donate', ] """list of articles in the online documentation""" diff --git a/searx/static/themes/simple/gruntfile.js b/searx/static/themes/simple/gruntfile.js index 50ea3b1d4..e9aadee92 100644 --- a/searx/static/themes/simple/gruntfile.js +++ b/searx/static/themes/simple/gruntfile.js @@ -189,6 +189,8 @@ module.exports = function (grunt) { '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', + 'heart-outline': 'node_modules/ionicons/dist/svg/heart-outline.svg', + 'help-circle-outline': 'src/svg/help-circle-outline.svg', }, dest: '../../../templates/simple/icons.html', }, diff --git a/searx/static/themes/simple/src/less/style.less b/searx/static/themes/simple/src/less/style.less index c2efcdd50..b97e113fe 100644 --- a/searx/static/themes/simple/src/less/style.less +++ b/searx/static/themes/simple/src/less/style.less @@ -639,16 +639,30 @@ article[data-vim-selected].category-social { } } -#linkto_preferences { +#links_on_top { position: absolute; .ltr-right(1.8rem); + .ltr-text-align-right(); top: 2.2rem; padding: 0; border: 0; - display: block; - font-size: 1.2em; + display: flex; + align-items: center; + font-size: 1em; color: var(--color-search-font); + a { + display: flex; + align-items: center; + margin-left: 1em; + + svg { + font-size: 1.2em; + .ltr-margin-right(0.125em); + } + } + + a, a:link *, a:hover *, a:visited *, @@ -706,6 +720,12 @@ article[data-vim-selected].category-social { */ .results-tablet() { + #links_on_top { + span { + display: none; + } + } + .page_with_header { margin: 2rem 0.5rem; width: auto; @@ -806,6 +826,25 @@ article[data-vim-selected].category-social { } } +@media screen and (max-width: calc(@tablet - 0.5px)) { + #links_on_top { + span { + display: none; + } + } +} + +@media screen and (max-width: 52rem) { + body.results_endpoint { + #links_on_top { + .link_on_top_about, + .link_on_top_donate { + display: none; + } + } + } +} + @media screen and (min-width: @phone) and (max-width: @tablet) { // when .center-aligment-yes, see style-center.less // the media query includes "min-width: @phone" @@ -872,12 +911,12 @@ article[data-vim-selected].category-social { margin: 1rem 0 0 0; } - #linkto_preferences { + #links_on_top { top: 0.8rem; .ltr-right(0.7rem); } - #main_index #linkto_preferences { + #main_index #links_on_top { top: 0.5rem; .ltr-right(0.5rem); } diff --git a/searx/static/themes/simple/src/svg/help-circle-outline.svg b/searx/static/themes/simple/src/svg/help-circle-outline.svg new file mode 100644 index 000000000..df36289d3 --- /dev/null +++ b/searx/static/themes/simple/src/svg/help-circle-outline.svg @@ -0,0 +1,5 @@ + \ No newline at end of file diff --git a/searx/templates/simple/base.html b/searx/templates/simple/base.html index c40183fdd..05662e1d2 100644 --- a/searx/templates/simple/base.html +++ b/searx/templates/simple/base.html @@ -40,10 +40,18 @@ {% endif %} - {% block linkto_preferences %} - {% from 'simple/icons.html' import icon_big %} - - {% endblock %} + {% block header %} {% endblock %} {% block content %} diff --git a/searx/templates/simple/info.html b/searx/templates/simple/info.html index b94ad0037..52b29b0ad 100644 --- a/searx/templates/simple/info.html +++ b/searx/templates/simple/info.html @@ -1,5 +1,7 @@ {% extends 'simple/page_with_header.html' %} {% block title %}{{ active_page.title }} - {% endblock %} +{% block linkto_about %}{% endblock %} +{% block linkto_donate %}{% endblock %} {% block content %}