Merge pull request #553 from return42/fix-oscar

[fix] oscar theme: use SearXNG logo and wordmark
This commit is contained in:
Markus Heiser 2021-11-27 00:34:22 +01:00 committed by GitHub
commit 96cb7123bb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
13 changed files with 6 additions and 6 deletions

View File

@ -1166,7 +1166,7 @@ input[type=checkbox]:not(:checked) + .label_hide_if_checked + .label_hide_if_not
border-bottom: #01D7D4 5px solid;
}
#main-logo {
margin-top: 10vh;
margin-top: 24vh;
margin-bottom: 25px;
}
#main-logo > img {

View File

@ -1193,7 +1193,7 @@ input[type=checkbox]:not(:checked) + .label_hide_if_checked + .label_hide_if_not
border-bottom: #01D7D4 5px solid;
}
#main-logo {
margin-top: 10vh;
margin-top: 24vh;
margin-bottom: 25px;
}
#main-logo > img {

Binary file not shown.

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.8 KiB

After

Width:  |  Height:  |  Size: 11 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 9.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 9.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 10 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 10 KiB

View File

@ -32,7 +32,7 @@
}
#main-logo{
margin-top: 10vh;
margin-top: 24vh;
margin-bottom: 25px;
}

View File

@ -4,10 +4,10 @@
<div class="row">{{- "" -}}
<div class="text-center col-sm-12 col-md-12">
{%- if cookies['oscar-style'] == 'pointhi' -%}
<h1 class="text-hide center-block"><img class="center-block img-responsive" src="{{ url_for('static', filename='img/searx_logo.png') }}" alt="searx logo"/>SearXNG</h1>
<h1 class="text-hide center-block"><img class="center-block img-responsive" src="{{ url_for('static', filename='img/searxng.svg') }}" alt="searx logo"/>SearXNG</h1>
{%- else -%}
<div class="text-hide center-block" id="main-logo">{{- "" -}}
<img class="center-block img-responsive" src="{{ url_for('static', filename='img/logo_searx_a.png') }}" alt="searx logo" />SearXNG{{- "" -}}
<img class="center-block img-responsive" src="{{ url_for('static', filename='img/searxng.svg') }}" alt="searx logo" />SearXNG{{- "" -}}
</div>
{%- endif -%}
</div>{{- "" -}}

View File

@ -83,7 +83,7 @@ class ViewsTestCase(SearxTestCase):
result = self.app.post('/')
self.assertEqual(result.status_code, 200)
self.assertIn(b'<div class="text-hide center-block" id="main-logo">'
+ b'<img class="center-block img-responsive" src="/static/themes/oscar/img/logo_searx_a.png"'
+ b'<img class="center-block img-responsive" src="/static/themes/oscar/img/searxng.svg"'
+ b' alt="searx logo" />SearXNG</div>', result.data)
def test_index_html_post(self):