Browse Source

[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 <markus.heiser@darmarit.de>
Markus Heiser 3 years ago
parent
commit
9349c71c54

+ 1 - 1
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%

+ 1 - 1
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
 

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

BIN
searx/static/themes/simple/img/searxng.png


+ 0 - 0
searx/static/themes/simple/img/searxng.svg → src/brand/searxng.svg


+ 1 - 1
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
 )