mirror of
https://github.com/searx/searx
synced 2024-12-02 15:10:21 +01:00
Merge branch 'master' into new-readme
This commit is contained in:
Markus Heiser
GitHub
commit
74d21ead56
@ -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;
|
||||
|
||||
File diff suppressed because one or more lines are too long
@ -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;
|
||||
|
||||
File diff suppressed because one or more lines are too long
@ -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;
|
||||
}
|
||||
|
||||
@ -77,4 +77,14 @@ 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 */
|
||||
}
|
||||
|
||||
@ -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 %}
|
||||
|
||||
|
||||
@ -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 %}
|
||||
|
||||
|
||||
@ -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)
|
||||
|
||||
Loading…
Reference in New Issue
Block a user