diff --git a/searx/static/themes/oscar/css/logicodev.min.css b/searx/static/themes/oscar/css/logicodev.min.css index bd58aa5b0..33d451b8f 100644 Binary files a/searx/static/themes/oscar/css/logicodev.min.css and b/searx/static/themes/oscar/css/logicodev.min.css differ diff --git a/searx/static/themes/oscar/less/logicodev/navbar.less b/searx/static/themes/oscar/less/logicodev/navbar.less index 2426210ca..411fd63c6 100644 --- a/searx/static/themes/oscar/less/logicodev/navbar.less +++ b/searx/static/themes/oscar/less/logicodev/navbar.less @@ -15,7 +15,7 @@ line-height: 30px; } -.navbar, .navbar-default{ +.navbar, .navbar-default, .menu { background-color: @black; border: none; border-top: 4px solid @light-green; @@ -52,3 +52,38 @@ .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; + } + } +} + +.menu-right { + right: 2em; +} + +.menu-left { + left: 2em; +} diff --git a/searx/templates/oscar/about.html b/searx/templates/oscar/about.html index 743d48074..673738172 100644 --- a/searx/templates/oscar/about.html +++ b/searx/templates/oscar/about.html @@ -1,5 +1,4 @@ {% extends "oscar/base.html" %} -{% block site_alert_warning_nojs %} {% endblock %} {% block title %}{{ _('about') }} - {% endblock %} {% block content %} diff --git a/searx/templates/oscar/base.html b/searx/templates/oscar/base.html index d3170d622..81d4febcf 100644 --- a/searx/templates/oscar/base.html +++ b/searx/templates/oscar/base.html @@ -59,13 +59,6 @@ {% endblock %} {% block site_alert_warning %} {% endblock %} - {% block site_alert_warning_nojs %} - - {% endblock %} {% block site_alert_info %} {% endblock %} {% block site_alert_success %} diff --git a/searx/templates/oscar/categories.html b/searx/templates/oscar/categories.html index 241d262ea..1ace10f16 100644 --- a/searx/templates/oscar/categories.html +++ b/searx/templates/oscar/categories.html @@ -3,7 +3,6 @@ {% for category in categories | reverse %} - {% endfor %} {% else %} {% for category in categories %} diff --git a/searx/templates/oscar/messages/js_disabled.html b/searx/templates/oscar/messages/js_disabled.html deleted file mode 100644 index 8baaf1e4c..000000000 --- a/searx/templates/oscar/messages/js_disabled.html +++ /dev/null @@ -1,4 +0,0 @@ - diff --git a/searx/templates/oscar/navbar.html b/searx/templates/oscar/navbar.html index c59bcda3d..d12de7dab 100644 --- a/searx/templates/oscar/navbar.html +++ b/searx/templates/oscar/navbar.html @@ -1,40 +1,14 @@