diff options
| author | Markus Heiser <markus.heiser@darmarit.de> | 2021-11-29 19:38:23 +0100 |
|---|---|---|
| committer | Markus Heiser <markus.heiser@darmarit.de> | 2021-11-29 19:53:28 +0100 |
| commit | 9349c71c54ef7ded18dff91c05b7583afa57c505 (patch) | |
| tree | fb8f4d865ac84d7d19496652e35133ee7df1b89b | |
| parent | e12debe9ee971aebd74ae6326dbbc087922e5302 (diff) | |
| download | searxng-9349c71c54ef7ded18dff91c05b7583afa57c505.tar.gz searxng-9349c71c54ef7ded18dff91c05b7583afa57c505.zip | |
[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>
| -rw-r--r-- | README.rst | 2 | ||||
| -rw-r--r-- | docs/conf.py | 2 | ||||
| -rw-r--r-- | searx/static/themes/simple/gruntfile.js | 7 | ||||
| -rw-r--r-- | searx/static/themes/simple/img/searxng.png | bin | 7698 -> 0 bytes | |||
| -rw-r--r-- | src/brand/searxng.svg (renamed from searx/static/themes/simple/img/searxng.svg) | 0 | ||||
| -rwxr-xr-x | utils/lib_static.sh | 2 |
6 files changed, 8 insertions, 5 deletions
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 Binary files differdeleted file mode 100644 index 201986391..000000000 --- a/searx/static/themes/simple/img/searxng.png +++ /dev/null diff --git a/searx/static/themes/simple/img/searxng.svg b/src/brand/searxng.svg index 5b55fa275..5b55fa275 100644 --- a/searx/static/themes/simple/img/searxng.svg +++ b/src/brand/searxng.svg 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 ) |
