Commit graph

5 commits

Author SHA1 Message Date
Cqoicebordel
14447a0761 Modify courgette theme and less it. 2015-01-16 00:55:28 +01:00
Adam Tauber
a04fafd419 Merge branch 'code_results' of https://github.com/pointhi/searx into pointhi-code_results
Conflicts:
	searx/static/themes/default/css/style.css
	searx/static/themes/oscar/css/oscar.min.css
	searx/templates/oscar/result_templates/torrent.html
2015-01-15 18:26:00 +01:00
Cqoicebordel
08df681b48 Tweaks of color and theme 2015-01-15 01:46:01 +01:00
Thomas Pointhuber
400b54191c Merge branch 'master' of https://github.com/asciimoo/searx into code_results
Conflicts:
	searx/engines/searchcode_code.py
	searx/engines/searchcode_doc.py
	searx/static/oscar/js/searx.min.js
	searx/templates/oscar/result_templates/default.html
	searx/templates/oscar/result_templates/images.html
	searx/templates/oscar/result_templates/map.html
	searx/templates/oscar/result_templates/torrent.html
	searx/templates/oscar/result_templates/videos.html
2015-01-09 21:30:09 +01:00
Adam Tauber
9f12605f7e [enh] themes static content refactor 2015-01-01 17:48:12 +01:00