From bf92aa3fdd7e6343b1aca55515a94b4de1c5ce30 Mon Sep 17 00:00:00 2001
From: Adam Tauber <asciimoo@gmail.com>
Date: Wed, 27 Jul 2016 02:08:24 +0200
Subject: [PATCH] [fix] wrap categories on small screens ++ some code
 formatting - closes #647

---
 .../static/themes/oscar/css/logicodev.min.css | Bin 8770 -> 8850 bytes
 searx/static/themes/oscar/css/pointhi.min.css | Bin 5121 -> 5180 bytes
 .../themes/oscar/less/logicodev/advanced.less |  21 ++++++++--------
 .../themes/oscar/less/logicodev/search.less   |  13 +++++++---
 .../themes/oscar/less/pointhi/advanced.less   |  23 +++++++++---------
 .../themes/oscar/less/pointhi/search.less     |  16 +++++++-----
 searx/templates/oscar/advanced.html           |  18 ++++++--------
 searx/templates/oscar/categories.html         |   4 +--
 searx/templates/oscar/search.html             |   4 ++-
 searx/templates/oscar/search_full.html        |   2 +-
 10 files changed, 56 insertions(+), 45 deletions(-)

diff --git a/searx/static/themes/oscar/css/logicodev.min.css b/searx/static/themes/oscar/css/logicodev.min.css
index 990ee2fe240cafd41f47063af9d593b95d50cfdd..93c037aca03991089a8286d3a4d04fff955a4cc8 100644
GIT binary patch
delta 227
zcmX@)GRbvA0k5ldN@j6EPGY51T25+(HHgqHFG?)10uc~yT26ksRZ)Jq0$3<9Co?@y
zH#tAABsH(Zs<@;mwIn%Xash9VG)QYYP@R<_L|;;3ab~eqVrfaf_2h@V69r3BD@t_1
z+O3j-dQ*#lx+Eu`<Kx-9mv1@~w{>z(YGRR9QhrIs<bGk9$pwPDC-?HPi<lRs=2{md
zrle%%rR(OTrj=OfnNJQBRM}i3^qxf=Dq&?{ots#co|&gxl3!q@XS}&w{4^H;aeq{4

delta 126
zcmbQ_ddOu%0WV|i<cGY%lTY%-P5vX;HhHCpxRjo0QEIMrL1IcuW?s5(QD%BZi4|B3
ztaS4az7<T96@_Ic9~ayWQZI>9JxJB&Jwjhtcybeq(lhgPOY#e>3^yMaKg|UI_p~pG

diff --git a/searx/static/themes/oscar/css/pointhi.min.css b/searx/static/themes/oscar/css/pointhi.min.css
index 9b0466cee1bfbcd20f6f4a522416efb0b68afa32..57a085eebff24c2ee92c80b7972c71567ca6ea98 100644
GIT binary patch
delta 183
zcmZqF*rTyQjMd0GC9}97C$Z8hEhn|Y8bs)p7bO;0fe7owoXqq*-Q@hdlGMBstKyQP
z)RN?k$qsCill566r9o=bi}K5@3?cfG5{om7trAO1@~tOpb4(O0Nv$Z+1sh?N4Ah@m
zwAq1eHY1O9a!zVukyTQDNk;8tK~CvOoUD`ouy32Jz^1tQDMvq}ctK)HN@iZVm4S6`
VVo`c#o^DBgft8-|<_4}tP5{gxK}!Gt

delta 63
zcmdm^(WtROjCHaHYtiI9j<(4$Y+RGyaA<C>V4KA_S%gz@vK_}Zkl^Mw96K0!aubWv
SGxKyy@(ZjCH}B?Z<OBe?+7;^n

diff --git a/searx/static/themes/oscar/less/logicodev/advanced.less b/searx/static/themes/oscar/less/logicodev/advanced.less
index 7e0469672..ba633525c 100644
--- a/searx/static/themes/oscar/less/logicodev/advanced.less
+++ b/searx/static/themes/oscar/less/logicodev/advanced.less
@@ -1,7 +1,8 @@
 #advanced-search-container {
-    display:none;
-    text-align:left;
-    margin-bottom:1rem;
+    display: none;
+    text-align: left;
+    margin-bottom: 1rem;
+    clear: both;
 
     label, .input-group-addon {
         font-size: 1.2rem;
@@ -11,9 +12,8 @@
         border-right: none;
         color: @dark-gray;
         padding-bottom: 0.4rem;
-        padding-top: 0.4rem;
-        padding-left: 0.5rem;
-        padding-right: 0.5rem;
+        padding-right: 0.7rem;
+        padding-left: 0.7rem;
     }
 
     label:last-child, .input-group-addon:last-child {
@@ -26,7 +26,7 @@
 
     input[type="radio"]:checked + label{
         color: @black;
-        font-weight:bold;
+        font-weight: bold;
         border-bottom: @light-green 5px solid;
     }
     select {
@@ -59,10 +59,11 @@ Ny0yNFQxMToxNTowMCswMjowMP7RDgQAAAAZdEVYdFNvZnR3YXJlAHd3dy5pbmtzY2FwZS5vcmeb
 }
 
 #check-advanced:checked ~ #advanced-search-container {
-    display:block;
+    display: block;
 }
 
 .advanced {
-    margin-top:1rem;
-    text-align:right;
+    padding: 0;
+    margin-top: 0.3rem;
+    text-align: right;
 }
diff --git a/searx/static/themes/oscar/less/logicodev/search.less b/searx/static/themes/oscar/less/logicodev/search.less
index f6d6b3dc6..4ebfe8899 100644
--- a/searx/static/themes/oscar/less/logicodev/search.less
+++ b/searx/static/themes/oscar/less/logicodev/search.less
@@ -1,18 +1,23 @@
 .search_categories, #categories {
   text-transform: capitalize;
   margin-bottom: 0.5rem;
+  display: flex;
+  flex-wrap: wrap;
+  flex-flow: row wrap;
+  align-content: stretch;
 
   label, .input-group-addon {
+    flex-grow: 1;
+    flex-basis: auto;
     font-size: 1.2rem;
-    font-weight:normal;
+    font-weight: normal;
     background-color: white;
     border: @mild-gray 1px solid;
     border-right: none;
     color: @dark-gray;
     padding-bottom: 0.4rem;
     padding-top: 0.4rem;
-    padding-left: 0.5rem;
-    padding-right: 0.5rem;
+    text-align: center;
   }
   label:last-child, .input-group-addon:last-child {
       border-right: @mild-gray 1px solid;
@@ -20,7 +25,7 @@
 
   input[type="checkbox"]:checked + label {
     color: @black;
-    font-weight:bold;
+    font-weight: bold;
     border-bottom: @light-green 5px solid;
   }
 }
diff --git a/searx/static/themes/oscar/less/pointhi/advanced.less b/searx/static/themes/oscar/less/pointhi/advanced.less
index a83af4866..826438292 100644
--- a/searx/static/themes/oscar/less/pointhi/advanced.less
+++ b/searx/static/themes/oscar/less/pointhi/advanced.less
@@ -1,7 +1,8 @@
 #advanced-search-container {
-    display:none;
-    text-align:center;
-    margin-bottom:1rem;
+    display: none;
+    text-align: center;
+    margin-bottom: 1rem;
+    clear: both;
 
     label, .input-group-addon {
         font-size: 1.3rem;
@@ -11,7 +12,6 @@
         border-right: none;
         color: #333;
         padding-bottom: 0.8rem;
-        padding-top: 0.8rem;
         padding-left: 1.2rem;
         padding-right: 1.2rem;
     }
@@ -19,14 +19,14 @@
     label:last-child, .input-group-addon:last-child {
         border-right: #DDD 1px solid;
     }
-    
+
     input[type="radio"] {
         display: none;
     }
-    
-    input[type="radio"]:checked + label{
+
+    input[type="radio"]:checked + label {
         color: black;
-        font-weight:bold;
+        font-weight: bold;
         background-color: #EEE;
     }
 }
@@ -36,10 +36,11 @@
 }
 
 #check-advanced:checked ~ #advanced-search-container {
-    display:block;
+    display: block;
 }
 
 .advanced {
-    margin-top:1rem;
-    text-align:right;
+    padding: 0;
+    margin-top: 0.3rem;
+    text-align: right;
 }
diff --git a/searx/static/themes/oscar/less/pointhi/search.less b/searx/static/themes/oscar/less/pointhi/search.less
index d12b69d31..cea67998f 100644
--- a/searx/static/themes/oscar/less/pointhi/search.less
+++ b/searx/static/themes/oscar/less/pointhi/search.less
@@ -1,19 +1,23 @@
 .search_categories, #categories {
     text-transform: capitalize;
-    margin-bottom:1.5rem;
-    margin-top:1.5rem;
+    margin-bottom: 1.5rem;
+    margin-top: 1.5rem;
+    display: flex;
+    flex-wrap: wrap;
+    align-content: stretch;
 
     label, .input-group-addon {
+        flex-grow: 1;
+        flex-basis: auto;
         font-size: 1.3rem;
-        font-weight:normal;
+        font-weight: normal;
         background-color: white;
         border: #DDD 1px solid;
         border-right: none;
         color: #333;
         padding-bottom: 0.8rem;
         padding-top: 0.8rem;
-        padding-left: 1.2rem;
-        padding-right: 1.2rem;
+        text-align: center;
     }
 
     label:last-child, .input-group-addon:last-child {
@@ -22,7 +26,7 @@
 
     input[type="checkbox"]:checked + label{
         color: black;
-        font-weight:bold;
+        font-weight: bold;
         background-color: #EEE;
     }
 }
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>