mirrors/searxng
1
0
Fork 0
mirror of https://github.com/searxng/searxng.git synced 2024-11-27 05:11:03 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into about-opensearch

Browse source
This commit is contained in:
Markus Heiser 2020-06-25 05:42:11 +00:00 committed by GitHub
commit a059c59cea
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
9 changed files with 103 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
searx/static/themes/oscar/css/logicodev-dark.css
View file

@ -70,7 +70,21 @@ input[type=checkbox]:not(:checked) + .label_hide_if_checked + .label_hide_if_not
-ms-user-select: none;
}
.onoffswitch-checkbox {
display: none;
opacity: 0;
position: absolute;
}
.onoffswitch-checkbox:before {
content: "";
display: inline-block;
width: 16px;
height: 16px;
margin-right: 10px;
position: absolute;
left: 0;
bottom: 1px;
background-color: #fff;
border: 1px solid #ccc;
border-radius: 0px;
}
.onoffswitch-label {
display: block;
@ -104,7 +118,7 @@ input[type=checkbox]:not(:checked) + .label_hide_if_checked + .label_hide_if_not
top: 0;
bottom: 0;
right: 0px;
border: 2px solid #FFFFFF !important;
border: 2px solid #FFFFFF;
border-radius: 50px !important;
transition: all 0.3s ease-in 0s;
}
@ -115,6 +129,9 @@ input[type=checkbox]:not(:checked) + .label_hide_if_checked + .label_hide_if_not
right: 71px;
background-color: #A1A1A1;
}
.onoffswitch-checkbox:focus + .onoffswitch-label .onoffswitch-switch {
border: 3px solid #444444;
}
.result_header {
margin-top: 0px;
margin-bottom: 2px;
@ -377,6 +394,17 @@ Ny0yNFQxMToxNTowMCswMjowMP7RDgQAAAAZdEVYdFNvZnR3YXJlAHd3dy5pbmtzY2FwZS5vcmeb
.search-margin {
margin-bottom: 0.6em;
}
.visually-hidden {
position: absolute !important;
height: 1px;
width: 1px;
overflow: hidden;
clip: rect(1px 1px 1px 1px);
/* IE6, IE7 */
clip: rect(1px, 1px, 1px, 1px);
white-space: nowrap;
/* added line */
}
#advanced-search-container {
display: none;
text-align: left;

2
searx/static/themes/oscar/css/logicodev-dark.min.css vendored
View file

File diff suppressed because one or more lines are too long

32
searx/static/themes/oscar/css/logicodev.css
View file

@ -43,7 +43,21 @@ input[type=checkbox]:not(:checked) + .label_hide_if_checked + .label_hide_if_not
-ms-user-select: none;
}
.onoffswitch-checkbox {
display: none;
opacity: 0;
position: absolute;
}
.onoffswitch-checkbox:before {
content: "";
display: inline-block;
width: 16px;
height: 16px;
margin-right: 10px;
position: absolute;
left: 0;
bottom: 1px;
background-color: #fff;
border: 1px solid #ccc;
border-radius: 0px;
}
.onoffswitch-label {
display: block;
@ -77,7 +91,7 @@ input[type=checkbox]:not(:checked) + .label_hide_if_checked + .label_hide_if_not
top: 0;
bottom: 0;
right: 0px;
border: 2px solid #FFFFFF !important;
border: 2px solid #FFFFFF;
border-radius: 50px !important;
transition: all 0.3s ease-in 0s;
}
@ -88,6 +102,9 @@ input[type=checkbox]:not(:checked) + .label_hide_if_checked + .label_hide_if_not
right: 71px;
background-color: #A1A1A1;
}
.onoffswitch-checkbox:focus + .onoffswitch-label .onoffswitch-switch {
border: 3px solid #444444;
}
.result_header {
margin-top: 0px;
margin-bottom: 2px;
@ -350,6 +367,17 @@ Ny0yNFQxMToxNTowMCswMjowMP7RDgQAAAAZdEVYdFNvZnR3YXJlAHd3dy5pbmtzY2FwZS5vcmeb
.search-margin {
margin-bottom: 0.6em;
}
.visually-hidden {
position: absolute !important;
height: 1px;
width: 1px;
overflow: hidden;
clip: rect(1px 1px 1px 1px);
/* IE6, IE7 */
clip: rect(1px, 1px, 1px, 1px);
white-space: nowrap;
/* added line */
}
#advanced-search-container {
display: none;
text-align: left;

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

File diff suppressed because one or more lines are too long

21
searx/static/themes/oscar/less/logicodev/onoff.less
View file

@ -9,7 +9,21 @@
-ms-user-select: none;
}
.onoffswitch-checkbox {
display: none;
opacity: 0;
position: absolute;
}
.onoffswitch-checkbox:before {
content: "";
display: inline-block;
width: 16px;
height: 16px;
margin-right: 10px;
position: absolute;
left: 0;
bottom: 1px;
background-color: #fff;
border: 1px solid #ccc;
border-radius: 0px;
}
.onoffswitch-label {
display: block;
@ -44,7 +58,7 @@
top: 0;
bottom: 0;
right: 0px;
border: 2px solid #FFFFFF !important;
border: 2px solid #FFFFFF;
border-radius: 50px !important;
transition: all 0.3s ease-in 0s;
}
@ -55,3 +69,6 @@
right: 71px;
background-color: #A1A1A1;
}
.onoffswitch-checkbox:focus + .onoffswitch-label .onoffswitch-switch {
border: 3px solid #444444;
}

10
searx/static/themes/oscar/less/logicodev/search.less
View file

@ -78,3 +78,13 @@ Ny0yNFQxMToxNTowMCswMjowMP7RDgQAAAAZdEVYdFNvZnR3YXJlAHd3dy5pbmtzY2FwZS5vcmeb
.search-margin {
margin-bottom: 0.6em;
}
.visually-hidden {
position: absolute !important;
height: 1px;
width: 1px;
overflow: hidden;
clip: rect(1px 1px 1px 1px); /* IE6, IE7 */
clip: rect(1px, 1px, 1px, 1px);
white-space: nowrap; /* added line */
}

2
searx/templates/oscar/infobox.html
View file

@ -5,7 +5,7 @@
{% for u in infobox.urls %}{% if u.official %} <a href="{{ u.url }}">{{ u.domain }}</a>{% endif %}{% endfor %}
</div>
<div class="panel-body">
{% if infobox.img_src %}<img class="img-responsive center-block infobox_part" src="{{ image_proxify(infobox.img_src) }}" alt="{{ infobox.infobox }}" />{% endif %}
{% if infobox.img_src %}<img class="img-responsive center-block infobox_part" src="{{ image_proxify(infobox.img_src) }}" />{% endif %}
{% if infobox.content %}<bdi><p class="infobox_part">{{ infobox.content | safe }}</p></bdi>{% endif %}

1
searx/templates/oscar/macros.html
View file

@ -91,6 +91,7 @@
<span class="onoffswitch-inner"></span>
<span class="onoffswitch-switch"></span>
</label>
<label class="visually-hidden" for="{{ id }}">{{ _('Allow') }}</label>
</div>
{%- endmacro %}

11
searx/webapp.py
View file

@ -335,8 +335,15 @@ def image_proxify(url):
if not request.preferences.get_value('image_proxy'):
return url
if url.startswith('data:image/jpeg;base64,'):
return url
if url.startswith('data:image/'):
# 50 is an arbitrary number to get only the beginning of the image.
partial_base64 = url[len('data:image/'):50].split(';')
if len(partial_base64) == 2 \
and partial_base64[0] in ['gif', 'png', 'jpeg', 'pjpeg', 'webp', 'tiff', 'bmp']\
and partial_base64[1].startswith('base64,'):
return url
else:
return None
if settings.get('result_proxy'):
return proxify(url)