Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 40c698b6 authored by Arnau Vàzquez's avatar Arnau Vàzquez
Browse files

Merge branch '61-dark-mode' into 'master' 

Dark mode

Closes #61

See merge request e/cloud/my-spot!65
parents ede69396 f103ddca

.gitattributes

+0 −8
Original line number Original line Diff line number Diff line 
searx/static/css/bootstrap.min.css -diff

searx/static/css/bootstrap.min.css -diff

searx/static/js/bootstrap.min.js -diff
 
searx/static/js/bootstrap.min.js -diff
 
searx/static/themes/oscar/css/logicodev.min.css -diff

searx/static/themes/oscar/css/leaflet.min.css -diff

searx/static/themes/oscar/css/pointhi.min.css -diff

searx/static/themes/oscar/js/searx.min.js -diff

searx/static/themes/simple/css/searx.min.css -diff

searx/static/themes/simple/css/searx-rtl.min.css -diff

searx/static/themes/simple/js/searx.min.js -diff

searx/static/themes/simple/js/searx.min.js.map -diff

Makefile

+2 −14
Original line number Original line Diff line number Diff line
@@ -117,18 +117,14 @@ node.clean: 
	$(Q)rm -rf \

	$(Q)rm -rf \

	  ./node_modules  \

	  ./node_modules  \

	  ./package-lock.json \

	  ./package-lock.json \

	  ./searx/static/themes/oscar/package-lock.json \

	  ./searx/static/themes/oscar/node_modules \

	  ./searx/static/themes/simple/package-lock.json \

	  ./searx/static/themes/simple/node_modules \

	  ./searx/static/themes/etheme/package-lock.json \

	  ./searx/static/themes/etheme/package-lock.json \

	  ./searx/static/themes/etheme/node_modules

	  ./searx/static/themes/etheme/node_modules





# build themes

# build themes

# ------------

# ------------





PHONY += themes themes.oscar themes.simple themes.etheme

PHONY += themes themes.etheme

themes: buildenv themes.oscar themes.simple themes.etheme

themes: buildenv themes.etheme





quiet_cmd_lessc = LESSC     $3

quiet_cmd_lessc = LESSC     $3

      cmd_lessc = PATH="$$(npm bin):$$PATH" \

      cmd_lessc = PATH="$$(npm bin):$$PATH" \
@@ -138,14 +134,6 @@ quiet_cmd_grunt = GRUNT $2 
      cmd_grunt = PATH="$$(npm bin):$$PATH" \

      cmd_grunt = PATH="$$(npm bin):$$PATH" \

	grunt --gruntfile  "$2"

	grunt --gruntfile  "$2"





themes.oscar: node.env

	$(Q)echo '[!] build oscar theme'

	$(call cmd,grunt,searx/static/themes/oscar/gruntfile.js)



themes.simple: node.env

	$(Q)echo '[!] build simple theme'

	$(call cmd,grunt,searx/static/themes/simple/gruntfile.js)



themes.etheme: node.env

themes.etheme: node.env

	$(Q)echo '[!] build etheme theme'

	$(Q)echo '[!] build etheme theme'

	$(call cmd,grunt,searx/static/themes/etheme/gruntfile.js)

	$(call cmd,grunt,searx/static/themes/etheme/gruntfile.js)

manage.sh

+0 −8
Original line number Original line Diff line number Diff line
@@ -90,14 +90,6 @@ npm_packages() { 
    cd -- "$BASE_DIR"

    cd -- "$BASE_DIR"

    npm install less@2.7 less-plugin-clean-css grunt-cli

    npm install less@2.7 less-plugin-clean-css grunt-cli





    echo '[!] install NPM packages for oscar theme'

    cd -- "$BASE_DIR/searx/static/themes/oscar"

    npm install



    echo '[!] install NPM packages for simple theme'

    cd -- "$BASE_DIR/searx/static/themes/simple"

    npm install



    echo '[!] install NPM packages for etheme theme'

    echo '[!] install NPM packages for etheme theme'

    cd -- "$BASE_DIR/searx/static/themes/etheme"

    cd -- "$BASE_DIR/searx/static/themes/etheme"

    npm install

    npm install

package-lock.json

0 → 100644
+945 −0

File added.

Preview size limit exceeded, changes collapsed.

searx/preferences.py

+4 −0
Original line number Original line Diff line number Diff line
@@ -377,6 +377,10 @@ class Preferences: 
                is_locked('theme'),

                is_locked('theme'),

                choices=themes

                choices=themes

            ),

            ),

            'etheme-style': EnumStringSetting(

                settings['ui'].get('theme_args', {}).get('ethemestyle', 'light'),

                is_locked('etheme-style'),

                choices=['', 'light', 'dark']),

            'results_on_new_tab': MapSetting(

            'results_on_new_tab': MapSetting(

                settings['ui'].get('results_on_new_tab', False),

                settings['ui'].get('results_on_new_tab', False),

                is_locked('results_on_new_tab'),

                is_locked('results_on_new_tab'),