ZaclysIndustries
/
searxngRebrandZaclys
forked from zaclys/searxng
2
0
Fork 0
Code Issues Pull Requests Activity

[fix] menu without js - closes #747

This commit is contained in:
Adam Tauber 2016-11-01 23:11:38 +01:00
parent e23c8f954b
commit 9782633054
8 changed files with 44 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
searx/static/themes/oscar/css/logicodev.min.css vendored
View File

File diff suppressed because one or more lines are too long

37
searx/static/themes/oscar/less/logicodev/navbar.less
View File

@ -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;
}

1
searx/templates/oscar/about.html
View File

@ -1,5 +1,4 @@
{% extends "oscar/base.html" %}
{% block site_alert_warning_nojs %} {% endblock %}
{% block title %}{{ _('about') }} - {% endblock %}
{% block content %}
<div{% if rtl %} dir="ltr"{% endif %}>

7
searx/templates/oscar/base.html
View File

@ -59,13 +59,6 @@
{% endblock %}
{% block site_alert_warning %}
{% 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 %}
{% endblock %}
{% block site_alert_success %}

1
searx/templates/oscar/categories.html
View File

@ -3,7 +3,6 @@
{% 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 for="checkbox_{{ category|replace(' ', '_') }}">{{ _(category) }}</label>
</label>
{% endfor %}
{% else %}
{% for category in categories %}

4
searx/templates/oscar/messages/js_disabled.html
View File

@ -1,4 +0,0 @@
<div class="alert alert-warning" role="alert">
<strong class="lead">{{ _('Warning!') }}</strong>
{{ _('Please enable JavaScript to use full functionality of this site.') }}
</div>

40
searx/templates/oscar/navbar.html
View File

@ -1,40 +1,14 @@
<!-- Static navbar -->
<div class="navbar navbar-default" role="navigation">
<div class="container-fluid">
{% if rtl %}
<div class="navbar-collapse collapse navbar-left">
<ul class="nav navbar-nav navbar-left"> <!-- results.html -->
<li{% if template_name == 'preferences.html' %} class="active"{% endif %}><a href="{{ url_for('preferences') }}" class="hmarg">{{ _('preferences') }}</a></li>
<li{% if template_name == 'about.html' %} class="active"{% endif %}><a href="{{ url_for('about') }}" class="hmarg">{{ _('about') }}</a></li>
<li{% if template_name == 'index.html' %} class="active"{% endif %}><a href="{{ url_for('index') }}" class="hmarg">{{ _('home') }}</a></li>
</ul>
</div>
<div class="navbar-header navbar-right">
<button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target=".navbar-collapse">
<span class="sr-only">{{ _('Toggle navigation') }}</span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
<div class="navbar-header{% if rtl %} navbar-right{% endif %}">
<a class="navbar-brand" href="{{ url_for('index') }}">{{ instance_name }}</a>
</div>
{% else %}
<div class="navbar-header">
<button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target=".navbar-collapse">
<span class="sr-only">{{ _('Toggle navigation') }}</span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
<a class="navbar-brand" href="{{ url_for('index') }}">{{ instance_name }}</a>
</div>
<div class="navbar-collapse collapse">
<ul class="nav navbar-nav navbar-right"> <!-- results.html -->
<li{% if template_name == 'index.html' %} class="active"{% endif %}><a href="{{ url_for('index') }}" class="hmarg">{{ _('home') }}</a></li>
<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 -->
{% endif %}
</div><!--/.container-fluid -->
</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 -->

5
searx/templates/oscar/preferences.html
View File

@ -1,11 +1,6 @@
{% from 'oscar/macros.html' import preferences_item_header, preferences_item_header_rtl, preferences_item_footer, preferences_item_footer_rtl, checkbox_toggle %}
{% extends "oscar/base.html" %}
{% block title %}{{ _('preferences') }} - {% endblock %}
{% block site_alert_warning_nojs %}
<noscript>
{% include 'oscar/messages/js_disabled.html' %}
</noscript>
{% endblock %}
{% block content %}
<div>