Merge branch 'master' of https://github.com/asciimoo/searx into csp-oscar-theme

This commit is contained in:
Markus Heiser 2020-06-16 10:17:03 +02:00
commit cc721b5d86
13 changed files with 25 additions and 19 deletions

View file

@ -0,0 +1 @@
var could_not_load = '{{ _('could not load data') }}!';

View file

@ -10,7 +10,7 @@
<meta name="referrer" content="no-referrer">
<meta name="viewport" content="width=device-width, initial-scale=1 , maximum-scale=1.0, user-scalable=1" />
{% block meta %}{% endblock %}
<script src="{{ url_for('js_translations') }}"></script>
<title>{% block title %}{% endblock %}{{ instance_name }}</title>
<link rel="stylesheet" href="{{ url_for('static', filename='css/bootstrap.min.css') }}" type="text/css" />
{% if preferences.get_value('oscar-style') -%}

View file

@ -12,6 +12,7 @@
<meta http-equiv="X-UA-Compatible" content="IE=edge, chrome=1">
<title>{% block title %}{% endblock %}{{ instance_name }}</title>
{% block meta %}{% endblock %}
<script src="{{ url_for('js_translations') }}"></script>
{% if rtl %}
<link rel="stylesheet" href="{{ url_for('static', filename='css/searx-rtl.min.css') }}" type="text/css" media="screen" />
{% else %}