From d635b5fd4dc684ecbc2aec7c9e9b3bdc6074b8ad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?No=C3=83=C2=A9mi=20V=C3=83=C2=A1nyi?=
 <sitbackandwait@gmail.com>
Date: Thu, 26 Jan 2017 21:28:31 +0100
Subject: [PATCH] [enh] make navbar smaller

---
 .../static/themes/oscar/css/logicodev.min.css | Bin 10382 -> 9547 bytes
 searx/static/themes/oscar/css/pointhi.min.css | Bin 6697 -> 6708 bytes
 .../themes/oscar/less/logicodev/navbar.less   | 100 ++++--------------
 .../themes/oscar/less/pointhi/navbar.less     |  43 +++-----
 searx/templates/oscar/navbar.html             |  21 ++--
 5 files changed, 46 insertions(+), 118 deletions(-)

diff --git a/searx/static/themes/oscar/css/logicodev.min.css b/searx/static/themes/oscar/css/logicodev.min.css
index 36d42f547e55983d72d977d285b83705f922e0c8..8dcca1994ce5afe947ad0db36cfd289311122b92 100644
GIT binary patch
delta 298
zcmZ9HI}U<C5QZB&du>T*Wdo>Dm&VfA7>_Wp4>rP%S=L7+#v9mp5fhK$9XyK|(5U77
z`5)h$m-qRJ6dcUn)3A-flrbbLX>g+%b;C(N7_cbiN~V^Eq;Gg03Dnjr)Pd8W7BZ!|
z*LWIf4U8!*DH(neySilL`%w-?D(%H+E#`Da#+B*#L*YR0@1`kkxhb2dsexYQ31(=h
zD}=cC?e60H7l$ZaSkMV~plp18z(#EFM##9R{(8;3IaEj)N_=lvT+{GUbf&j!>)}2D
DpfhW=

delta 1208
zcma)6U5=YD5LPeHmtKG>Z>u#T*>tySOF2N_dIW<Fv1&Zj3|YFU;s$-`QF@Htpr<JY
z8$z=E;Q`^9@yvYRe8bNV-#+%S;ir^aB4o}RjZruc=0nUgR3~}hx54_?D0+mGwEr2K
zL)O$?+VkvFVWBaCZg!7%+r3~JXs~pXY{i4vfAy6QS{-;-aUql`Xu?Wv3uR~${KWM;
z#-!I7=WEgXs-3Sgt&F@ON2!V<(z~Q;L$XT<w{a;=^PRtb)B7G%utHjDz(_WI6NHNH
zt2U}ZD-rqjnJ+zh-wnk*xcokU%=ueYR$!4EWH}flPg5%oNiv;l^(^T&-pZ1pY>}Yt
zxv6uoCDrgGZN_Wq;gA#%p`^Q^1$G8$1bL2;JriYwZ0UC9ZZ&hq;U)ehp!Y0Kj4bv*
z{t8~8a}G-_H{y@Uz1LB_zR@k@^hg~$D~Vh~T;}bjIuAVb^P<)r?tcroA2miN@vghL
z*4<nWp(wQMCe4mg7`S&hy=l<%+%l`6R;a*Go(@uKP%^J9C$!$FE;*ZF;-4_{y#wro
z9cJzfQ?aPgFD}qXc%vh&7Izfi526c8#&QiDsg`+<L-HC)jbF4J<v-^h?nk`45Wte#
m|4WvTu-`6(Shs`S_@+BqPD#m75Igr8Z8u#CKR&<uwfPP2ps=+7

diff --git a/searx/static/themes/oscar/css/pointhi.min.css b/searx/static/themes/oscar/css/pointhi.min.css
index 921d60a32d9225d636a8186e7b418371d4698cef..26a2c85153976422abf3494446f0ff88d56b5895 100644
GIT binary patch
delta 260
zcmX|+O%8%E5QWd-j)bix{?r)DX$Cr!MwptRA`yw_ap%GVifM5<U*>%;?<GI-eOf&`
z1RexIUjUB<lxM^4N?N6en3t|`tWp5TYqX~JYM1R9+q`n*MQ87*wgEJjP{f~zE}*p~
zqq4(4aSM{;W;11>_z{{DSVyqjs&+l{*a90%f<yUF<Z<vqW9b;Yb)?7<F18rXEOj2J
T#017TK}wlNSA*5OV^&RHt>9l*

delta 249
zcmYjLOAdlC5Iu)GE>MD|F>!jD5(b#0onl)OwK1N@oeK{rMFeN@GI^hQ^OjHfI_(}7
zc}!OOju<L6=%yj=^5z0Xatyi-&WsUNbOXrYqH5<G^poW#h#S1XzWR;ok-9#DtR|l!
zM)617%iL9rCT%VDyfm+3VQABf@`zTg-?hf+2nO3Y9S>22cr^&@7{77hb9<T*4rmuP
J2U3Qa`v4D=TGapm

diff --git a/searx/static/themes/oscar/less/logicodev/navbar.less b/searx/static/themes/oscar/less/logicodev/navbar.less
index 411fd63c6..5da7115d9 100644
--- a/searx/static/themes/oscar/less/logicodev/navbar.less
+++ b/searx/static/themes/oscar/less/logicodev/navbar.less
@@ -1,89 +1,31 @@
-.navbar-default .navbar-nav > .active > a, .navbar-default .navbar-nav > .active > a:hover, .navbar-default .navbar-nav > .active > a:focus{
+.searx-navbar {
     background: @black;
-    color: @light-green;
-}
+    height: 2.3rem;
+    font-size: 1.3rem;
+    line-height: 1.3rem;
+    padding: 0.5rem;
+    font-weight: bold;
+    margin-bottom: 0.8rem;
 
-.navbar > li > a {
-    padding: 0;
-    margin: 0;
-}
-
-.navbar-nav > li > a {
-    background: @black;
-    padding: 0 8px;
-    margin: 0;
-    line-height: 30px;
-}
-
-.navbar, .navbar-default, .menu {
-    background-color: @black;
-    border: none;
-    border-top: 4px solid @light-green;
-    padding-top: 5px;
-    color: @dim-gray !important;
-    font-weight: 700;
-    font-size: 1.1em;
-    text-transform: lowercase;
-    margin-bottom: 24px;
-    height: 30px;
-    line-height: 30px;
-
-    .navbar-nav > li > a{
-        color: @dim-gray;
+    a, a:hover {
+        margin-right: 2.0rem;
+        color: white;
+        text-decoration: none;
     }
 
-    .navbar-brand{
-        font-weight: 700;
+    .instance a {
         color: @light-green;
-        line-height: 30px;
-        padding: 0 30px;
-        margin: 0;
-    }
-    z-index: 10;
-}
-
-// Hover color
-// http://stackoverflow.com/users/114029/leniel-macaferi
-.navbar-default .navbar-nav > li > a:hover, .navbar-default .navbar-nav > li > a:focus {
-    color: @light-green;
-    background: @black;
-}
-
-.navbar-toggle {
-    margin-top: 0;
-}
-
-.menu {
-    margin: 0;
-    padding: 0;
-    position: absolute;
-    top: 4px;
-    border: 0;
-    z-index: 1000000000;
-    height: 40px;
-    line-height: 40px;
-    ul {
-        padding: 0;
-        margin: 0;
-        li {
-            padding: 0 0.6em;
-            margin: 0;
-            float: left;
-            list-style: none;
-            a {
-                color: @dim-gray;
-            }
-        }
-        li.active a {
-            color: @light-green;
-        }
+        margin-left: 2.0rem;
     }
 }
 
-.menu-right {
-    right: 2em;
+#main-logo {
+    margin-top: 20vh;
+    margin-bottom: 25px;
+
+    & > img {
+        max-width: 350px;
+        width: 80%;
+    }
 }
 
-.menu-left {
-    left: 2em;
-}
diff --git a/searx/static/themes/oscar/less/pointhi/navbar.less b/searx/static/themes/oscar/less/pointhi/navbar.less
index f0ce53e71..527ad593d 100644
--- a/searx/static/themes/oscar/less/pointhi/navbar.less
+++ b/searx/static/themes/oscar/less/pointhi/navbar.less
@@ -1,28 +1,19 @@
-.menu {
-    margin: 0;
-    padding: 0;
-    position: absolute;
-    top: 4px;
-    border: 0;
-    z-index: 1000000000;
-    height: 40px;
-    line-height: 40px;
-    ul {
-        padding: 0;
-        margin: 0;
-        li {
-            padding: 0 0.6em;
-            margin: 0;
-            float: left;
-            list-style: none;
-        }
+.searx-navbar {
+    background: #eee;
+    color: #aaa;
+    height: 2.3rem;
+    font-size: 1.3rem;
+    line-height: 1.3rem;
+    padding: 0.5rem;
+    font-weight: bold;
+
+    a, a:hover {
+        margin-right: 2.0rem;
+        text-decoration: none;
+    }
+
+    .instance a {
+        color: #444;
+        margin-left: 2.0rem;
     }
 }
-
-.menu-right {
-    right: 2em;
-}
-
-.menu-left {
-    left: 2em;
-}
diff --git a/searx/templates/oscar/navbar.html b/searx/templates/oscar/navbar.html
index d12de7dab..12bf14ffa 100644
--- a/searx/templates/oscar/navbar.html
+++ b/searx/templates/oscar/navbar.html
@@ -1,14 +1,9 @@
-<!-- Static navbar -->
-<div class="navbar navbar-default" role="navigation">
-    <div class="container-fluid">
-        <div class="navbar-header{% if rtl %} navbar-right{% endif %}">
-            <a class="navbar-brand" href="{{ url_for('index') }}">{{ instance_name }}</a>
-        </div>
-    </div><!--/.container-fluid -->
+<div class="searx-navbar">
+    <span class="instance {% if rtl %}pull-right{% else %}pull-left{% endif%}">
+        <a href="{{ url_for('index') }}">{{ instance_name }}</a>
+    </span>
+    <span class="{% if rtl %}pull-left{% else %}pull-right{% endif %}">
+        <a href="{{ url_for('about') }}">{{ _('about') }}</a>
+        <a href="{{ url_for('preferences') }}">{{ _('preferences') }}</a>
+    </span>
 </div>
-<div class="menu menu-{% if rtl %}left{% else %}right{% endif %}">
-    <ul> <!-- results.html -->
-        <li{% if template_name == 'about.html' %} class="active"{% endif %}><a href="{{ url_for('about') }}" class="hmarg">{{ _('about') }}</a></li>
-        <li{% if template_name == 'preferences.html' %} class="active"{% endif %}><a href="{{ url_for('preferences') }}" class="hmarg">{{ _('preferences') }}</a></li>
-    </ul>
-</div><!--/.nav-collapse -->