From 096ffd0659ea93a1de0009e37e49f71d576d2de6 Mon Sep 17 00:00:00 2001
From: Thomas Pointhuber <thomas.pointhuber@gmx.at>
Date: Sun, 18 Jan 2015 12:00:38 +0100
Subject: [enh] add new bootstrap-themes to oscar-template

---
 searx/templates/oscar/base.html | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'searx/templates/oscar/base.html')

diff --git a/searx/templates/oscar/base.html b/searx/templates/oscar/base.html
index 42cd4e9a7..c39de0460 100644
--- a/searx/templates/oscar/base.html
+++ b/searx/templates/oscar/base.html
@@ -10,7 +10,11 @@
     {% block meta %}{% endblock %}
     <title>{% block title %}{% endblock %}searx</title>
     
-    <link rel="stylesheet" href="{{ url_for('static', filename='css/bootstrap.min.css') }}" type="text/css" />
+    {% if bootstrap_theme == 'default' %}
+        <link rel="stylesheet" href="{{ url_for('static', filename='css/bootstrap.min.css') }}" type="text/css" />
+    {% else %}
+        <link rel="stylesheet" href="{{ url_for('static', filename='css/bootstrap.' + bootstrap_theme + '.min.css') }}" type="text/css" />
+    {% endif %}
     <link rel="stylesheet" href="{{ url_for('static', filename='css/oscar.min.css') }}" type="text/css" />  
     <link rel="stylesheet" href="{{ url_for('static', filename='css/leaflet.min.css') }}" type="text/css" />
 
-- 
cgit v1.2.3


From 016a0ffe8a0b97cd89e15e95a1cec5465d9c516e Mon Sep 17 00:00:00 2001
From: Thomas Pointhuber <thomas.pointhuber@gmx.at>
Date: Sun, 18 Jan 2015 13:03:53 +0100
Subject: [enh] show js warning only if menu can't be used or inside
 preferences

---
 searx/templates/oscar/base.html | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'searx/templates/oscar/base.html')

diff --git a/searx/templates/oscar/base.html b/searx/templates/oscar/base.html
index c39de0460..5a3ba9f42 100644
--- a/searx/templates/oscar/base.html
+++ b/searx/templates/oscar/base.html
@@ -57,7 +57,9 @@
     {% endblock %}
     {% block site_alert_warning_nojs %}
     <noscript>
+        <div class="visible-xs-block">
         {% include 'oscar/messages/js_disabled.html' %}
+        </div>
     </noscript>
     {% endblock %}
     {% block site_alert_info %}
-- 
cgit v1.2.3


From 1f00ce8527c8ca0f6318f4b43b3f79ee1429b70b Mon Sep 17 00:00:00 2001
From: Thomas Pointhuber <thomas.pointhuber@gmx.at>
Date: Sun, 18 Jan 2015 13:54:24 +0100
Subject: Revert: [enh] add new bootstrap-themes to oscar-template

---
 searx/templates/oscar/base.html | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

(limited to 'searx/templates/oscar/base.html')

diff --git a/searx/templates/oscar/base.html b/searx/templates/oscar/base.html
index 5a3ba9f42..57c4d5593 100644
--- a/searx/templates/oscar/base.html
+++ b/searx/templates/oscar/base.html
@@ -10,11 +10,7 @@
     {% block meta %}{% endblock %}
     <title>{% block title %}{% endblock %}searx</title>
     
-    {% if bootstrap_theme == 'default' %}
-        <link rel="stylesheet" href="{{ url_for('static', filename='css/bootstrap.min.css') }}" type="text/css" />
-    {% else %}
-        <link rel="stylesheet" href="{{ url_for('static', filename='css/bootstrap.' + bootstrap_theme + '.min.css') }}" type="text/css" />
-    {% endif %}
+    <link rel="stylesheet" href="{{ url_for('static', filename='css/bootstrap.min.css') }}" type="text/css" />
     <link rel="stylesheet" href="{{ url_for('static', filename='css/oscar.min.css') }}" type="text/css" />  
     <link rel="stylesheet" href="{{ url_for('static', filename='css/leaflet.min.css') }}" type="text/css" />
 
-- 
cgit v1.2.3