git.iko.soy/searx
on master help sign in
theme: oscar - tidy up trailing whitespaces and tab usage
2a5c39eMarkus Heiser
searx/static/themes/oscar/gruntfile.js+3−3
compare with master
unifiedsplit
@@ -24,7 +24,7 @@ module.exports = function(grunt) {
24 jshint: {
24 jshint: {
25 files: ['gruntfile.js', 'js/searx_src/*.js'],
25 files: ['gruntfile.js', 'js/searx_src/*.js'],
26 options: {
26 options: {
27− reporterOutput: "",
27+ reporterOutput: "",
28 // options here to override JSHint defaults
28 // options here to override JSHint defaults
29 globals: {
29 globals: {
30 jQuery: true,
30 jQuery: true,
@@ -55,7 +55,7 @@ module.exports = function(grunt) {
55 "css/logicodev-dark.min.css": "less/logicodev-dark/oscar.less"}
55 "css/logicodev-dark.min.css": "less/logicodev-dark/oscar.less"}
56 },
56 },
57 /*
57 /*
58− // built with ./manage.sh styles
58+ // built with ./manage.sh styles
59 bootstrap: {
59 bootstrap: {
60 options: {
60 options: {
61 paths: ["less/bootstrap"],
61 paths: ["less/bootstrap"],
@@ -90,7 +90,7 @@ module.exports = function(grunt) {
90 grunt.registerTask('test', ['jshint']);
90 grunt.registerTask('test', ['jshint']);
91
91
92 grunt.registerTask('default', ['jshint', 'concat', 'uglify', 'less']);
92 grunt.registerTask('default', ['jshint', 'concat', 'uglify', 'less']);
93−
93+
94 grunt.registerTask('styles', ['less']);
94 grunt.registerTask('styles', ['less']);
95
95
96};
96};
searx/static/themes/oscar/less/logicodev-dark/oscar.less+2−2
@@ -109,7 +109,7 @@ ul.nav li a {
109
109
110.btn:hover {
110.btn:hover {
111 color:#444 !important;
111 color:#444 !important;
112− background-color: #BBB !important;
112+ background-color: #BBB !important;
113}
113}
114
114
115.btn-primary.active {
115.btn-primary.active {
@@ -221,7 +221,7 @@ p.btn.btn-default{
221}
221}
222
222
223.table-hover > tbody > tr:hover > td, .table-hover > tbody > tr:hover > th {
223.table-hover > tbody > tr:hover > td, .table-hover > tbody > tr:hover > th {
224− background: rgb(102, 105, 110) !important;
224+ background: rgb(102, 105, 110) !important;
225}
225}
226
226
227.btn-success {
227.btn-success {
searx/static/themes/oscar/less/logicodev/code.less+1−3
@@ -78,7 +78,7 @@ pre, code{
78 user-select: none;
78 user-select: none;
79 cursor: default;
79 cursor: default;
80 color: #556366;
80 color: #556366;
81−
81+
82 &::selection {
82 &::selection {
83 background: transparent; /* WebKit/Blink Browsers */
83 background: transparent; /* WebKit/Blink Browsers */
84 }
84 }
@@ -99,5 +99,3 @@ pre, code{
99.highlight {
99.highlight {
100 font-weight: 700;
100 font-weight: 700;
101}
101}
102−
103−
searx/static/themes/oscar/less/logicodev/infobox.less+1−1
@@ -30,7 +30,7 @@
30 table-layout: fixed;
30 table-layout: fixed;
31
31
32 }
32 }
33−
33+
34 .infobox_part:last-child {
34 .infobox_part:last-child {
35 margin-bottom: 0;
35 margin-bottom: 0;
36 }
36 }
searx/static/themes/oscar/less/logicodev/navbar.less−1
@@ -28,4 +28,3 @@
28 width: 80%;
28 width: 80%;
29 }
29 }
30}
30}
31−
searx/static/themes/oscar/less/pointhi/code.less+1−1
@@ -69,7 +69,7 @@
69 -ms-user-select: none;
69 -ms-user-select: none;
70 user-select: none;
70 user-select: none;
71 cursor: default;
71 cursor: default;
72−
72+
73 &::selection {
73 &::selection {
74 background: transparent; /* WebKit/Blink Browsers */
74 background: transparent; /* WebKit/Blink Browsers */
75 }
75 }
searx/static/themes/oscar/less/pointhi/infobox.less+1−1
@@ -4,7 +4,7 @@
4 word-wrap: break-word;
4 word-wrap: break-word;
5 table-layout: fixed;
5 table-layout: fixed;
6 }
6 }
7−
7+
8 .infobox_part:last-child {
8 .infobox_part:last-child {
9 margin-bottom: 0;
9 margin-bottom: 0;
10 }
10 }
searx/templates/oscar/languages.html+7−7
@@ -3,10 +3,10 @@
3{%- else -%}
3{%- else -%}
4<select class="time_range custom-select form-control" id='language' name='language'>
4<select class="time_range custom-select form-control" id='language' name='language'>
5{%- endif -%}
5{%- endif -%}
6− <option value="all" {% if current_language == 'all' %}selected="selected"{% endif %}>{{ _('Default language') }}</option>
6+ <option value="all" {% if current_language == 'all' %}selected="selected"{% endif %}>{{ _('Default language') }}</option>
7− {%- for lang_id,lang_name,country_name,english_name in language_codes | sort(attribute=1) -%}
7+ {%- for lang_id,lang_name,country_name,english_name in language_codes | sort(attribute=1) -%}
8− <option value="{{ lang_id }}" {% if lang_id == current_language %}selected="selected"{% endif %}>
8+ <option value="{{ lang_id }}" {% if lang_id == current_language %}selected="selected"{% endif %}>
9− {{- lang_name }} {% if country_name %}({{ country_name }}) {% endif %}- {{ lang_id -}}
9+ {{- lang_name }} {% if country_name %}({{ country_name }}) {% endif %}- {{ lang_id -}}
10− </option>
10+ </option>
11− {%- endfor -%}
11+ {%- endfor -%}
12−</select>
12+</select>
searx/templates/oscar/preferences.html+33−33
@@ -41,7 +41,7 @@
41 {% set language_label = _('Search language') %}
41 {% set language_label = _('Search language') %}
42 {% set language_info = _('What language do you prefer for search?') %}
42 {% set language_info = _('What language do you prefer for search?') %}
43 {{ preferences_item_header(language_info, language_label, rtl) }}
43 {{ preferences_item_header(language_info, language_label, rtl) }}
44− {% include 'oscar/languages.html' %}
44+ {% include 'oscar/languages.html' %}
45 {{ preferences_item_footer(language_info, language_label, rtl) }}
45 {{ preferences_item_footer(language_info, language_label, rtl) }}
46
46
47 {% set locale_label = _('Interface language') %}
47 {% set locale_label = _('Interface language') %}
@@ -156,26 +156,26 @@
156 <div class="container-fluid">
156 <div class="container-fluid">
157 <fieldset>
157 <fieldset>
158 <div class="table-responsive">
158 <div class="table-responsive">
159− <table class="table table-hover table-condensed table-striped">
159+ <table class="table table-hover table-condensed table-striped">
160− <tr>
160+ <tr>
161 {% if not rtl %}
161 {% if not rtl %}
162− <th>{{ _("Allow") }}</th>
162+ <th>{{ _("Allow") }}</th>
163− <th>{{ _("Engine name") }}</th>
163+ <th>{{ _("Engine name") }}</th>
164− <th>{{ _("Shortcut") }}</th>
164+ <th>{{ _("Shortcut") }}</th>
165− <th>{{ _("Selected language") }}</th>
165+ <th>{{ _("Selected language") }}</th>
166− <th>{{ _("SafeSearch") }}</th>
166+ <th>{{ _("SafeSearch") }}</th>
167− <th>{{ _("Time range") }}</th>
167+ <th>{{ _("Time range") }}</th>
168− <th>{{ _("Avg. time") }}</th>
168+ <th>{{ _("Avg. time") }}</th>
169− <th>{{ _("Max time") }}</th>
169+ <th>{{ _("Max time") }}</th>
170 {% else %}
170 {% else %}
171− <th>{{ _("Max time") }}</th>
171+ <th>{{ _("Max time") }}</th>
172− <th>{{ _("Avg. time") }}</th>
172+ <th>{{ _("Avg. time") }}</th>
173− <th>{{ _("Time range") }}</th>
173+ <th>{{ _("Time range") }}</th>
174− <th>{{ _("SafeSearch") }}</th>
174+ <th>{{ _("SafeSearch") }}</th>
175− <th>{{ _("Selected language") }}</th>
175+ <th>{{ _("Selected language") }}</th>
176− <th>{{ _("Shortcut") }}</th>
176+ <th>{{ _("Shortcut") }}</th>
177− <th>{{ _("Engine name") }}</th>
177+ <th>{{ _("Engine name") }}</th>
178− <th>{{ _("Allow") }}</th>
178+ <th>{{ _("Allow") }}</th>
179 {% endif %}
179 {% endif %}
180 </tr>
180 </tr>
181 {% for search_engine in engines_by_category[categ] %}
181 {% for search_engine in engines_by_category[categ] %}
@@ -186,19 +186,19 @@
186 {{ checkbox_toggle('engine_' + search_engine.name|replace(' ', '_') + '__' + categ|replace(' ', '_'), (search_engine.name, categ) in disabled_engines) }}
186 {{ checkbox_toggle('engine_' + search_engine.name|replace(' ', '_') + '__' + categ|replace(' ', '_'), (search_engine.name, categ) in disabled_engines) }}
187 </td>
187 </td>
188 <th>{{ search_engine.name }}</th>
188 <th>{{ search_engine.name }}</th>
189− <td class="name">{{ shortcuts[search_engine.name] }}</td>
189+ <td class="name">{{ shortcuts[search_engine.name] }}</td>
190− <td>{{ support_toggle(stats[search_engine.name].supports_selected_language) }}</td>
190+ <td>{{ support_toggle(stats[search_engine.name].supports_selected_language) }}</td>
191− <td>{{ support_toggle(search_engine.safesearch==True) }}</td>
191+ <td>{{ support_toggle(search_engine.safesearch==True) }}</td>
192− <td>{{ support_toggle(search_engine.time_range_support==True) }}</td>
192+ <td>{{ support_toggle(search_engine.time_range_support==True) }}</td>
193− <td class="{{ 'danger' if stats[search_engine.name]['warn_time'] else '' }}">{{ 'N/A' if stats[search_engine.name].time==None else stats[search_engine.name].time }}</td>
193+ <td class="{{ 'danger' if stats[search_engine.name]['warn_time'] else '' }}">{{ 'N/A' if stats[search_engine.name].time==None else stats[search_engine.name].time }}</td>
194− <td class="{{ 'danger' if stats[search_engine.name]['warn_timeout'] else '' }}">{{ search_engine.timeout }}</td>
194+ <td class="{{ 'danger' if stats[search_engine.name]['warn_timeout'] else '' }}">{{ search_engine.timeout }}</td>
195− {% else %}
195+ {% else %}
196− <td class="{{ 'danger' if stats[search_engine.name]['warn_timeout'] else '' }}">{{ search_engine.timeout }}</td>
196+ <td class="{{ 'danger' if stats[search_engine.name]['warn_timeout'] else '' }}">{{ search_engine.timeout }}</td>
197− <td class="{{ 'danger' if stats[search_engine.name]['warn_time'] else '' }}">{{ 'N/A' if stats[search_engine.name].time==None else stats[search_engine.name].time }}</td>
197+ <td class="{{ 'danger' if stats[search_engine.name]['warn_time'] else '' }}">{{ 'N/A' if stats[search_engine.name].time==None else stats[search_engine.name].time }}</td>
198− <td>{{ support_toggle(search_engine.time_range_support==True) }}</td>
198+ <td>{{ support_toggle(search_engine.time_range_support==True) }}</td>
199− <td>{{ support_toggle(search_engine.safesearch==True) }}</td>
199+ <td>{{ support_toggle(search_engine.safesearch==True) }}</td>
200− <td>{{ support_toggle(stats[search_engine.name].supports_selected_language) }}</td>
200+ <td>{{ support_toggle(stats[search_engine.name].supports_selected_language) }}</td>
201− <td>{{ shortcuts[search_engine.name] }}</td>
201+ <td>{{ shortcuts[search_engine.name] }}</td>
202 <th>{{ search_engine.name }}</th>
202 <th>{{ search_engine.name }}</th>
203 <td class="onoff-checkbox">
203 <td class="onoff-checkbox">
204 {{ checkbox_toggle('engine_' + search_engine.name|replace(' ', '_') + '__' + categ|replace(' ', '_'), (search_engine.name, categ) in disabled_engines) }}
204 {{ checkbox_toggle('engine_' + search_engine.name|replace(' ', '_') + '__' + categ|replace(' ', '_'), (search_engine.name, categ) in disabled_engines) }}
@@ -207,7 +207,7 @@
207 </tr>
207 </tr>
208 {% endif %}
208 {% endif %}
209 {% endfor %}
209 {% endfor %}
210− </table>
210+ </table>
211 </div>
211 </div>
212 </fieldset>
212 </fieldset>
213 </div>
213 </div>
searx/templates/oscar/result_templates/images.html+1−1
@@ -22,7 +22,7 @@
22 <span class="label label-default pull-right">{{ result.engine }}</span>{{- "" -}}
22 <span class="label label-default pull-right">{{ result.engine }}</span>{{- "" -}}
23 <p class="text-muted pull-left">{{ result.pretty_url }}</p>{{- "" -}}
23 <p class="text-muted pull-left">{{ result.pretty_url }}</p>{{- "" -}}
24 <div class="clearfix"></div>{{- "" -}}
24 <div class="clearfix"></div>{{- "" -}}
25− <div class="row">{{- "" -}}
25+ <div class="row">{{- "" -}}
26 <div class="col-md-6">{{- "" -}}
26 <div class="col-md-6">{{- "" -}}
27 <a href="{{ result.img_src }}" {% if results_on_new_tab %}target="_blank" rel="noopener noreferrer"{% else %}rel="noreferrer"{% endif %} class="btn btn-default">{{ _('Get image') }}</a>{{- "" -}}
27 <a href="{{ result.img_src }}" {% if results_on_new_tab %}target="_blank" rel="noopener noreferrer"{% else %}rel="noreferrer"{% endif %} class="btn btn-default">{{ _('Get image') }}</a>{{- "" -}}
28 </div>{{- "" -}}
28 </div>{{- "" -}}