From c68c53acd8970cacb282f23651d3619e918ffc20 Mon Sep 17 00:00:00 2001 From: Markus Heiser Date: Sat, 20 Nov 2021 10:14:55 +0100 Subject: [PATCH 1/2] [brand] initial - folder src/brand for searxng-wordmark Folder src/brand is intended to place logo, wordmark and more in. This commit moves the origin (source) of searxng-wordmark.svg from the simple theme into this folder About the new created src/ folder: On the long term we can move all the files from static/themes//src/* into a src/themes//* folder. Signed-off-by: Markus Heiser --- manage | 3 +-- searx/static/themes/simple/gruntfile.js | 2 +- .../src/svg => src/brand}/searxng-wordmark.svg | Bin 3 files changed, 2 insertions(+), 3 deletions(-) rename {searx/static/themes/simple/src/svg => src/brand}/searxng-wordmark.svg (100%) diff --git a/manage b/manage index 494c8174..ec8e13c0 100755 --- a/manage +++ b/manage @@ -706,10 +706,9 @@ themes.oscar() { } themes.simple() { - local src="searx/static/themes/simple/src" local static="searx/static/themes/simple" ( set -e - convert_if_newer "$src/svg/searxng-wordmark.svg" "$static/img/favicon.png" \ + convert_if_newer "src/brand/searxng-wordmark.svg" "$static/img/favicon.png" \ -transparent white -resize 64x64 build_msg GRUNT "theme: simple" npm --prefix searx/static/themes/simple run build diff --git a/searx/static/themes/simple/gruntfile.js b/searx/static/themes/simple/gruntfile.js index 3d72a927..a82c0ab1 100644 --- a/searx/static/themes/simple/gruntfile.js +++ b/searx/static/themes/simple/gruntfile.js @@ -102,7 +102,7 @@ module.exports = function(grunt) { svgo: ['--config', 'svg4web.svgo.js'] }, files: { - '../../../templates/__common__/searxng-wordmark.min.svg': 'src/svg/searxng-wordmark.svg' + '../../../templates/__common__/searxng-wordmark.min.svg': '../../../../src/brand/searxng-wordmark.svg' } } }, diff --git a/searx/static/themes/simple/src/svg/searxng-wordmark.svg b/src/brand/searxng-wordmark.svg similarity index 100% rename from searx/static/themes/simple/src/svg/searxng-wordmark.svg rename to src/brand/searxng-wordmark.svg From 4330d7cf5d5bc9617bc778e9a7e8a469274125ee Mon Sep 17 00:00:00 2001 From: Markus Heiser Date: Sat, 20 Nov 2021 10:49:21 +0100 Subject: [PATCH 2/2] [mod] gruntfile.js - define grunt.template _brand & _templates [1] https://gruntjs.com/api/grunt.template Signed-off-by: Markus Heiser --- searx/static/themes/simple/gruntfile.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/searx/static/themes/simple/gruntfile.js b/searx/static/themes/simple/gruntfile.js index a82c0ab1..006d6441 100644 --- a/searx/static/themes/simple/gruntfile.js +++ b/searx/static/themes/simple/gruntfile.js @@ -5,6 +5,10 @@ module.exports = function(grunt) { const path = require('path'); grunt.initConfig({ + + _brand: '../../../../src/brand', + _templates: '../../../templates', + pkg: grunt.file.readJSON('package.json'), watch: { scripts: { @@ -102,7 +106,7 @@ module.exports = function(grunt) { svgo: ['--config', 'svg4web.svgo.js'] }, files: { - '../../../templates/__common__/searxng-wordmark.min.svg': '../../../../src/brand/searxng-wordmark.svg' + '<%= _templates %>/__common__/searxng-wordmark.min.svg': '<%= _brand %>/searxng-wordmark.svg' } } },