[fix] wrap categories on small screens ++ some code formatting - closes #647

4 files changed, 14 insertions, 14 deletions

diff --git a/searx/templates/oscar/advanced.html b/searx/templates/oscar/advanced.html
index cc37378a1..2c694cf5f 100644
--- a/searx/templates/oscar/advanced.html
+++ b/searx/templates/oscar/advanced.html
@@ -1,11 +1,9 @@
-<div class="input-group col-sm-12 advanced">
-    <input type="checkbox" name="advanced_search" id="check-advanced" {% if advanced_search %} checked="checked"{% endif %}>
-    <label for="check-advanced">
-        <span class="glyphicon glyphicon-cog"></span>
-        {{ _('Advanced settings') }}
-    </label>
-    <div id="advanced-search-container">
-        {% include 'oscar/categories.html' %}
-        {% include 'oscar/time-range.html' %}
-    </div>
+<input type="checkbox" name="advanced_search" id="check-advanced" {% if advanced_search %} checked="checked"{% endif %}>
+<label for="check-advanced">
+    <span class="glyphicon glyphicon-cog"></span>
+    {{ _('Advanced settings') }}
+</label>
+<div id="advanced-search-container">
+    {% include 'oscar/categories.html' %}
+    {% include 'oscar/time-range.html' %}
 </div>
diff --git a/searx/templates/oscar/categories.html b/searx/templates/oscar/categories.html
index d850bb744..241d262ea 100644
--- a/searx/templates/oscar/categories.html
+++ b/searx/templates/oscar/categories.html
@@ -2,13 +2,13 @@
 {% if rtl %}
     {% for category in categories | reverse %}
         <input class="hidden" type="checkbox" id="checkbox_{{ category|replace(' ', '_') }}" name="category_{{ category }}" {% if category in selected_categories %}checked="checked"{% endif %} />
-        <label class="input-group-addon" for="checkbox_{{ category|replace(' ', '_') }}">{{ _(category) }}</label>
+        <label for="checkbox_{{ category|replace(' ', '_') }}">{{ _(category) }}</label>
         </label>
     {% endfor %}
 {% else %}
     {% for category in categories %}
         <input class="hidden" type="checkbox" id="checkbox_{{ category|replace(' ', '_') }}" name="category_{{ category }}" {% if category in selected_categories %}checked="checked"{% endif %} />
-        <label class="input-group-addon" for="checkbox_{{ category|replace(' ', '_') }}">{{ _(category) }}</label>
+        <label for="checkbox_{{ category|replace(' ', '_') }}">{{ _(category) }}</label>
     {% endfor %}
 {% endif %}
 </div>
diff --git a/searx/templates/oscar/search.html b/searx/templates/oscar/search.html
index 6e0650a7c..6a3b2d294 100644
--- a/searx/templates/oscar/search.html
+++ b/searx/templates/oscar/search.html
@@ -6,5 +6,7 @@
             <button type="submit" class="btn btn-default"><span class="hide_if_nojs">{{ icon('search') }}</span><span class="hidden active_if_nojs">{{ _('Start search') }}</span></button>

         </span>

     </div>

-    {% include 'oscar/advanced.html' %}

+    <div class="input-group col-sm-12 advanced">

+        {% include 'oscar/advanced.html' %}

+    </div>

 </form><!-- / #search_form_full -->

diff --git a/searx/templates/oscar/search_full.html b/searx/templates/oscar/search_full.html
index 4d16ef2dc..6fdae4028 100644
--- a/searx/templates/oscar/search_full.html
+++ b/searx/templates/oscar/search_full.html
@@ -11,7 +11,7 @@
             <button type="submit" class="btn btn-default input-lg"><span class="hide_if_nojs">{{ icon('search') }}</span><span class="hidden active_if_nojs">{{ _('Start search') }}</span></button>

         </span>

     </div>

-    <div class="input-group col-md-8 col-md-offset-2">

+    <div class="col-md-8 col-md-offset-2  advanced">

         {% include 'oscar/advanced.html' %}

     </div>