Merge pull request #561 from return42/fix-README

[brand] README: add SearXNG logo

README.rst

@@ -1,24 +1,46 @@
 .. SPDX-License-Identifier: AGPL-3.0-or-later
 
-|searx install|
+.. figure:: https://raw.githubusercontent.com/searxng/searxng/master/src/brand/searxng.svg
-|searx homepage|
+   :target: https://searxng.github.io/searxng/
-|searx wiki|
+   :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 <https://github.com/searxng/searxng/wiki/Changes-from-version-1.0.0>`_
 
 .. _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

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
 

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'
+
         }
       }
     },

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
 )