Merge branch 'master' into fix-infinite-scroll (e64ff382) · Commits · e / infra / spot

.gitignore

+3 −0

Original line number	Original line	Diff line number	Diff line
	@@ -19,5 +19,8 @@ node_modules/

	.tx/		.tx/

			build/
			dist/
	local/		local/
			gh-pages/
	searx.egg-info/		searx.egg-info/

Makefile

+27 −0

Original line number	Original line	Diff line number	Diff line
	# -- coding: utf-8; mode: makefile-gmake --		# -- coding: utf-8; mode: makefile-gmake --

			export GIT_URL=https://github.com/asciimoo/searx
			export SEARX_URL=https://searx.me
			export DOCS_URL=https://asciimoo.github.io/searx

	PYOBJECTS = searx		PYOBJECTS = searx
			DOC = docs
	PY_SETUP_EXTRAS ?= \[test\]		PY_SETUP_EXTRAS ?= \[test\]

			PYDIST=./dist/py
			PYBUILD=./build/py

	include utils/makefile.include		include utils/makefile.include
	include utils/makefile.python		include utils/makefile.python
			include utils/makefile.sphinx

	all: clean install		all: clean install

	PHONY += help		PHONY += help
	help:		help:
	@echo ' test - run developer tests'		@echo ' test - run developer tests'
			@echo ' docs - build documentation'
			@echo ' docs-live - autobuild HTML documentation while editing'
	@echo ' run - run developer instance'		@echo ' run - run developer instance'
	@echo ' install - developer install (./local)'		@echo ' install - developer install (./local)'
	@echo ' uninstall - uninstall (./local)'		@echo ' uninstall - uninstall (./local)'
			@echo ' gh-pages - build docs & deploy on gh-pages branch'
			@echo ' clean - drop builds and environments'
	@echo ''		@echo ''
	@$(MAKE) -s -f utils/makefile.include make-help		@$(MAKE) -s -f utils/makefile.include make-help
	@echo ''		@echo ''
	@@ -40,6 +53,20 @@ run: pyenvinstall
	) &		) &
	$(PY_ENV)/bin/python ./searx/webapp.py		$(PY_ENV)/bin/python ./searx/webapp.py

			# docs
			# ----

			PHONY += docs
			docs: pyenvinstall sphinx-doc
			$(call cmd,sphinx,html,docs,docs)

			PHONY += docs-live
			docs-live: pyenvinstall sphinx-live
			$(call cmd,sphinx_autobuild,html,docs,docs)

			$(GH_PAGES)::
			@echo "doc available at --> $(DOCS_URL)"

	# test		# test
	# ----		# ----

README.rst

+3 −3

Original line number	Original line	Diff line number	Diff line
	@@ -23,13 +23,13 @@ Go to the `searx-docker <https://github.com/searx/searx-docker>`__ project.

	Without Docker		Without Docker
	------		------
	For all the details, follow this `step by step installation <https://asciimoo.github.io/searx/dev/install/installation.html>`__.		For all of the details, follow this `step by step installation <https://asciimoo.github.io/searx/dev/install/installation.html>`__.

	Note: the documentation needs to be updated.		Note: the documentation needs to be updated.

	If you are in hurry		If you are in a hurry
	------		------
	- clone source:		- clone the source:
	``git clone https://github.com/asciimoo/searx.git && cd searx``		``git clone https://github.com/asciimoo/searx.git && cd searx``
	- install dependencies: ``./manage.sh update_packages``		- install dependencies: ``./manage.sh update_packages``
	- edit your		- edit your

docs/_themes/searx/static/searx.css

0 → 100644

+130 −0

Original line number	Original line	Diff line number	Diff line
			@import url("pocoo.css");

			a, a.reference, a.footnote-reference {
			color: #004b6b;
			border-color: #004b6b;
			}

			a:hover {
			color: #6d4100;
			border-color: #6d4100;
			}

			p.version-warning {
			background-color: #004b6b;
			}

			div.sidebar {
			background-color: whitesmoke;
			border-color: lightsteelblue;
			border-radius: 3pt;
			}

			p.sidebar-title, .sidebar p {
			margin: 6pt;
			}

			.sidebar li,
			.hlist li {
			list-style-type: disclosure-closed;
			}


			/* admonitions
			*/

			div.admonition, div.topic {
			background-color: #fafafa;
			margin: 8px 0px;
			padding: 1em;
			border-radius: 3pt 0 0 3pt;
			border-top: none;
			border-right: none;
			border-bottom: none;
			border-left: 5pt solid #ccc;
			}

			p.admonition-title:after {
			content: none;
			}

			.admonition.hint { border-color: #416dc0b0; }
			.admonition.note { border-color: #6c856cb0; }
			.admonition.tip { border-color: #85c5c2b0; }
			.admonition.attention { border-color: #ecec97b0; }
			.admonition.caution { border-color: #a6c677b0; }
			.admonition.danger { border-color: #d46262b0; }
			.admonition.important { border-color: #dfa3a3b0; }
			.admonition.error { border-color: red; }
			.admonition.warning { border-color: darkred; }

			.admonition.admonition-generic-admonition-title {
			border-color: #416dc0b0;
			}


			/* admonitions with (rendered) reST markup examples (:class: rst-example)
			*
			* .. admonition:: title of the example
			* :class: rst-example
			* ....
			*/

			div.rst-example {
			background-color: inherit;
			margin: 0;
			border-top: none;
			border-right: 1px solid #ccc;
			border-bottom: none;
			border-left: none;
			border-radius: none;
			padding: 0;
			}

			div.rst-example > p.admonition-title {
			font-family: Sans Serif;
			font-style: italic;
			font-size: 0.8em;
			display: block;
			border-bottom: 1px solid #ccc;
			padding: 0.5em 1em;
			text-align: right;
			}

			/* code block in figures
			*/

			div.highlight pre {
			text-align: left;
			}

			/* Table theme
			*/

			thead, tfoot {
			background-color: #fff;
			}

			th:hover, td:hover {
			background-color: #ffc;
			}

			thead th, tfoot th, tfoot td, tbody th {
			background-color: #fffaef;
			}

			tbody tr:nth-child(odd) {
			background-color: #fff;
			}

			tbody tr:nth-child(even) {
			background-color: #fafafa;
			}

			caption {
			font-family: Sans Serif;
			padding: 0.5em;
			margin: 0.5em 0 0.5em 0;
			caption-side: top;
			text-align: left;
			}

docs/_themes/searx/theme.conf

0 → 100644

+6 −0

Original line number	Original line	Diff line number	Diff line
			[theme]
			inherit = pocoo
			stylesheet = searx.css

			[options]
			touch_icon =