From e12debe9ee971aebd74ae6326dbbc087922e5302 Mon Sep 17 00:00:00 2001 From: Markus Heiser Date: Mon, 29 Nov 2021 13:26:31 +0100 Subject: [brand] README: add SearXNG logo Signed-off-by: Markus Heiser --- README.rst | 44 +++++++++++++++++++++++++++++--------------- 1 file changed, 29 insertions(+), 15 deletions(-) diff --git a/README.rst b/README.rst index be45c9c41..308e4d0a9 100644 --- a/README.rst +++ b/README.rst @@ -1,24 +1,46 @@ .. SPDX-License-Identifier: AGPL-3.0-or-later -|searx install| -|searx homepage| -|searx wiki| +.. figure:: https://raw.githubusercontent.com/searxng/searxng/master/searx/static/themes/simple/img/searxng.svg + :target: https://searxng.github.io/searxng/ + :alt: SearXNG + :width: 100% + :align: center + + +|SearXNG install| +|SearXNG homepage| +|SearXNG wiki| |AGPL License| |Issues| |commits| |weblate| +|SearXNG logo| Privacy-respecting, hackable `metasearch engine`_ +If you are looking for running instances, ready to use, then visit searx.space_. + +Otherwise jump to the user_, admin_ and developer_ handbooks you will find on +our homepage_. + +.. _searx.space: https://searx.space +.. _user: https://searxng.github.io/searxng/user +.. _admin: https://searxng.github.io/searxng/admin +.. _developer: https://searxng.github.io/searxng/dev +.. _homepage: https://searxng.github.io/searxng .. _metasearch engine: https://en.wikipedia.org/wiki/Metasearch_engine -.. |searx install| image:: https://img.shields.io/badge/-install-blue +.. |SearXNG logo| image:: https://raw.githubusercontent.com/searxng/searxng/master/src/brand/searxng-wordmark.svg + :target: https://searxng.github.io/searxng + :width: 5% + +.. |SearXNG install| image:: https://img.shields.io/badge/-install-blue :target: https://searxng.github.io/searxng/admin/installation.html -.. |searx homepage| image:: https://img.shields.io/badge/-homepage-blue +.. |SearXNG homepage| image:: https://img.shields.io/badge/-homepage-blue :target: https://searxng.github.io/searxng -.. |searx wiki| image:: https://img.shields.io/badge/-wiki-blue +.. |SearXNG wiki| image:: https://img.shields.io/badge/-wiki-blue :target: https://github.com/searxng/searxng/wiki .. |AGPL License| image:: https://img.shields.io/badge/license-AGPL-blue.svg @@ -36,10 +58,7 @@ Privacy-respecting, hackable `metasearch engine`_ .. |weblate| image:: https://weblate.bubu1.eu/widgets/searxng/-/searxng/svg-badge.svg :target: https://weblate.bubu1.eu/projects/searxng/ -If you are looking for running instances, ready to use, then visit searx.space_. - -Otherwise jump to the user_, admin_ and developer_ handbooks you will find on -our homepage_. +---- SearXNG is a fork of `searx`_: @@ -47,8 +66,3 @@ SearXNG is a fork of `searx`_: * `exhaustive changelog `_ .. _searx: https://github.com/searx/searx -.. _searx.space: https://searx.space -.. _user: https://searxng.github.io/searxng/user -.. _admin: https://searxng.github.io/searxng/admin -.. _developer: https://searxng.github.io/searxng/dev -.. _homepage: https://searxng.github.io/searxng -- cgit v1.2.3 From 9349c71c54ef7ded18dff91c05b7583afa57c505 Mon Sep 17 00:00:00 2001 From: Markus Heiser Date: Mon, 29 Nov 2021 19:38:23 +0100 Subject: [mod] themes/simple/img/searxng.svg -> src/brand/searxng.svg * move `searx/static/themes/simple/img/searxng.svg` to `src/brand/searxng.svg` * README.rst can use it without a reference to a theme. * the simple theme can create `searx/static/themes/simple/img/searxng.png` using the svg2png task Suggested-by: @dalf https://github.com/searxng/searxng/pull/561#issuecomment-981747902 Signed-off-by: Markus Heiser --- README.rst | 2 +- docs/conf.py | 2 +- searx/static/themes/simple/gruntfile.js | 7 ++- searx/static/themes/simple/img/searxng.png | Bin 7698 -> 0 bytes searx/static/themes/simple/img/searxng.svg | 96 ----------------------------- src/brand/searxng.svg | 96 +++++++++++++++++++++++++++++ utils/lib_static.sh | 2 +- 7 files changed, 104 insertions(+), 101 deletions(-) delete mode 100644 searx/static/themes/simple/img/searxng.png delete mode 100644 searx/static/themes/simple/img/searxng.svg create mode 100644 src/brand/searxng.svg diff --git a/README.rst b/README.rst index 308e4d0a9..025569dfb 100644 --- a/README.rst +++ b/README.rst @@ -1,6 +1,6 @@ .. SPDX-License-Identifier: AGPL-3.0-or-later -.. figure:: https://raw.githubusercontent.com/searxng/searxng/master/searx/static/themes/simple/img/searxng.svg +.. figure:: https://raw.githubusercontent.com/searxng/searxng/master/src/brand/searxng.svg :target: https://searxng.github.io/searxng/ :alt: SearXNG :width: 100% diff --git a/docs/conf.py b/docs/conf.py index 5bc83ebe6..56f3e1d9f 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -133,7 +133,7 @@ html_sidebars = { "**": ["project.html", "relations.html", "searchbox.html", "sourcelink.html"], } singlehtml_sidebars = {"index": ["project.html", "localtoc.html"]} -html_logo = "../searx/static/themes/simple/src/svg/searxng-wordmark.svg" +html_logo = "../src/brand/searxng-wordmark.svg" html_title = "SearXNG Documentation ({})".format(VERSION_STRING) html_show_sourcelink = True diff --git a/searx/static/themes/simple/gruntfile.js b/searx/static/themes/simple/gruntfile.js index d51316dcf..8075e0797 100644 --- a/searx/static/themes/simple/gruntfile.js +++ b/searx/static/themes/simple/gruntfile.js @@ -147,14 +147,17 @@ module.exports = function(grunt) { svgo: ['--config', 'svg4web.svgo.js'] }, files: { - '<%= _templates %>/__common__/searxng-wordmark.min.svg': '<%= _brand %>/searxng-wordmark.svg' + '<%= _templates %>/__common__/searxng-wordmark.min.svg': '<%= _brand %>/searxng-wordmark.svg', + 'img/searxng.svg': '<%= _brand %>/searxng.svg' } } }, svg2png: { favicon: { files: { - 'img/favicon.png': '<%= _brand %>/searxng-wordmark.svg' + 'img/favicon.png': '<%= _brand %>/searxng-wordmark.svg', + 'img/searxng.png': '<%= _brand %>/searxng.svg' + } } }, diff --git a/searx/static/themes/simple/img/searxng.png b/searx/static/themes/simple/img/searxng.png deleted file mode 100644 index 201986391..000000000 Binary files a/searx/static/themes/simple/img/searxng.png and /dev/null differ diff --git a/searx/static/themes/simple/img/searxng.svg b/searx/static/themes/simple/img/searxng.svg deleted file mode 100644 index 5b55fa275..000000000 --- a/searx/static/themes/simple/img/searxng.svg +++ /dev/null @@ -1,96 +0,0 @@ - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - diff --git a/src/brand/searxng.svg b/src/brand/searxng.svg new file mode 100644 index 000000000..5b55fa275 --- /dev/null +++ b/src/brand/searxng.svg @@ -0,0 +1,96 @@ + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + diff --git a/utils/lib_static.sh b/utils/lib_static.sh index 32e0dc598..785bb2687 100755 --- a/utils/lib_static.sh +++ b/utils/lib_static.sh @@ -11,7 +11,7 @@ STATIC_BUILT_PATHS=( searx/static/themes/simple/css searx/static/themes/simple/js searx/static/themes/simple/src/generated/pygments.less - searx/static/themes/simple/img/favicon.png + searx/static/themes/simple/img searx/templates/__common__/searxng-wordmark.min.svg searx/templates/simple/icons.html ) -- cgit v1.2.3 From e2e585319e8f0685d749580619b94bcc5085eaf5 Mon Sep 17 00:00:00 2001 From: Markus Heiser Date: Mon, 29 Nov 2021 19:42:05 +0100 Subject: [build] /static --- searx/static/themes/simple/img/searxng.png | Bin 0 -> 8872 bytes searx/static/themes/simple/img/searxng.svg | 1 + 2 files changed, 1 insertion(+) create mode 100644 searx/static/themes/simple/img/searxng.png create mode 100644 searx/static/themes/simple/img/searxng.svg diff --git a/searx/static/themes/simple/img/searxng.png b/searx/static/themes/simple/img/searxng.png new file mode 100644 index 000000000..36a889711 Binary files /dev/null and b/searx/static/themes/simple/img/searxng.png differ diff --git a/searx/static/themes/simple/img/searxng.svg b/searx/static/themes/simple/img/searxng.svg new file mode 100644 index 000000000..26a55f7dd --- /dev/null +++ b/searx/static/themes/simple/img/searxng.svg @@ -0,0 +1 @@ + \ No newline at end of file -- cgit v1.2.3