From f3aff26086dda1c2610c9aa845db119ad413006f Mon Sep 17 00:00:00 2001
From: mrpaulblack <paul@paulgo.io>
Date: Sun, 21 Nov 2021 21:38:00 +0100
Subject: [PATCH 1/2] =?UTF-8?q?[simple=20theme]=20rework=20select;=20add?=
=?UTF-8?q?=20safesearch=20to=20search=20and=20replace=20/=20with=20?=
=?UTF-8?q?=E2=80=BA=20in=20article=20url?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
* rework selection UI in pref (fix based on: https://github.com/twelsby/searx/commit/78643e9f43a103c523f112e9f3ce26a5c7bb3a0f)
* moved search filters underneath categories
* cut params from url and replace / with ›
* make h3 and url in article bigger
* add safe search select to search filter (this will not override settings and only be valid while on result page in a session)
* make search form button not overlap each other when js is disabled
* 1rem padding around preview image and thumbnail in default article template
---
.../themes/simple/src/js/main/search.js | 1 +
.../themes/simple/src/less/definitions.less | 14 ++---
.../static/themes/simple/src/less/index.less | 3 +-
.../themes/simple/src/less/preferences.less | 26 +++++++--
.../static/themes/simple/src/less/search.less | 49 +++++++++-------
.../static/themes/simple/src/less/style.less | 58 +++++++++++++------
.../themes/simple/src/less/toolkit.less | 21 ++++---
searx/templates/simple/categories.html | 2 +-
.../simple/{ => filters}/languages.html | 2 +-
.../templates/simple/filters/safesearch.html | 5 ++
.../time_range.html} | 2 +-
searx/templates/simple/macros.html | 6 +-
searx/templates/simple/search.html | 28 ++++-----
searx/templates/simple/simple_search.html | 6 +-
searx/webapp.py | 11 ++++
15 files changed, 153 insertions(+), 81 deletions(-)
rename searx/templates/simple/{ => filters}/languages.html (97%)
create mode 100644 searx/templates/simple/filters/safesearch.html
rename searx/templates/simple/{time-range.html => filters/time_range.html} (97%)
diff --git a/searx/static/themes/simple/src/js/main/search.js b/searx/static/themes/simple/src/js/main/search.js
index d3149340a..0244a90ea 100644
--- a/searx/static/themes/simple/src/js/main/search.js
+++ b/searx/static/themes/simple/src/js/main/search.js
@@ -98,6 +98,7 @@
return false;
});
+ searxng.on(d.getElementById('safesearch'), 'change', submitIfQuery);
searxng.on(d.getElementById('time_range'), 'change', submitIfQuery);
searxng.on(d.getElementById('language'), 'change', submitIfQuery);
}
diff --git a/searx/static/themes/simple/src/less/definitions.less b/searx/static/themes/simple/src/less/definitions.less
index 909fb0877..95370849d 100644
--- a/searx/static/themes/simple/src/less/definitions.less
+++ b/searx/static/themes/simple/src/less/definitions.less
@@ -89,11 +89,10 @@
--color-toolkit-dialog-background: #fff;
--color-toolkit-tabs-label-border: #fff;
--color-toolkit-tabs-section-border: #ddd;
+ --color-toolkit-select-background: #f7f7f7;
--color-toolkit-select-border: #ddd;
- --color-toolkit-select-border-hover: #bbb;
+ --color-toolkit-select-background-hover: #bbb;
--color-toolkit-input-text-font: #222;
- --color-toolkit-input-text-border: #ddd;
- --color-toolkit-input-text-border-hover: #bbb;
--color-toolkit-checkbox-onoff-background: #ddd;
--color-toolkit-checkbox-onoff-label-background: #3050ff;
--color-toolkit-checkbox-onoff-checked-background: #aaa;
@@ -162,8 +161,8 @@
--color-result-link-font: #8af;
--color-result-link-font-highlight: #8af;
--color-result-link-visited-font: #96b;
- --color-result-publishdate-font: #777;
- --color-result-engines-font: #777;
+ --color-result-publishdate-font: #888;
+ --color-result-engines-font: #888;
--color-result-search-url-border: #555;
--color-result-search-url-font: #fff;
/// Detail modal : same as the light version
@@ -190,11 +189,10 @@
--color-toolkit-dialog-background: #222;
--color-toolkit-tabs-label-border: #222;
--color-toolkit-tabs-section-border: #555;
+ --color-toolkit-select-background: #3c3b31;
--color-toolkit-select-border: #555;
- --color-toolkit-select-border-hover: #777;
+ --color-toolkit-select-background-hover: #333;
--color-toolkit-input-text-font: #fff;
- --color-toolkit-input-text-border: #555;
- --color-toolkit-input-text-border-hover: #777;
--color-toolkit-checkbox-onoff-background: #3c3b31;
--color-toolkit-checkbox-onoff-label-background: #58f;
--color-toolkit-checkbox-onoff-checked-background: #ddd;
diff --git a/searx/static/themes/simple/src/less/index.less b/searx/static/themes/simple/src/less/index.less
index b30dad1d2..9a244da00 100644
--- a/searx/static/themes/simple/src/less/index.less
+++ b/searx/static/themes/simple/src/less/index.less
@@ -22,7 +22,8 @@
visibility: hidden;
}
- #search {
+ #search,
+ #search_header {
margin: 0 auto;
background: inherit;
border: inherit;
diff --git a/searx/static/themes/simple/src/less/preferences.less b/searx/static/themes/simple/src/less/preferences.less
index db6831341..c6e691b9d 100644
--- a/searx/static/themes/simple/src/less/preferences.less
+++ b/searx/static/themes/simple/src/less/preferences.less
@@ -41,13 +41,15 @@
input[type="text"] {
width: 13.25rem;
color: var(--color-toolkit-input-text-font);
- border: 1px solid var(--color-toolkit-input-text-border);
- background: none repeat scroll 0 0 var(--color-base-background);
- padding: 0.4rem;
+ border: none;
+ background: none repeat scroll 0 0 var(--color-toolkit-select-background);
+ padding: 0.2rem 0.4rem;
+ height: 2rem;
.rounded-corners-tiny;
- &:hover {
- border: 1px solid var(--color-toolkit-input-text-border-hover);
+ &:hover,
+ &:focus {
+ background-color: var(--color-toolkit-select-background-hover);
}
}
@@ -103,6 +105,20 @@
}
}
+ .category {
+ margin-right: 0.5rem;
+
+ label {
+ border: 2px solid transparent;
+ padding: 0.2rem 0.4rem;
+ .rounded-corners-tiny;
+ }
+ }
+
+ .category input[type="checkbox"]:checked + label {
+ border: 2px solid var(--color-categories-item-border-selected);
+ }
+
.name,
.shortcut {
text-align: left;
diff --git a/searx/static/themes/simple/src/less/search.less b/searx/static/themes/simple/src/less/search.less
index 99aa02a34..04ee2cea8 100644
--- a/searx/static/themes/simple/src/less/search.less
+++ b/searx/static/themes/simple/src/less/search.less
@@ -3,6 +3,11 @@
*/
#search {
+ padding: 0;
+ margin: 0;
+}
+
+#search_header {
padding: 1.5em 2em 0 @results-offset - 3rem;
margin: 0;
background: var(--color-header-background);
@@ -68,13 +73,10 @@
grid-area: categories;
}
-#search_wrapper {
+.search_box {
+ margin: 0;
padding: 0;
grid-area: search;
-}
-
-.search_box {
- margin: 0 12px 0 0;
display: inline-flex;
flex-direction: row;
white-space: nowrap;
@@ -148,21 +150,36 @@
}
}
+.no-js #clear_search,
.no-js #send_search {
width: auto !important;
+ border-left: 1px solid var(--color-search-border);
+ padding: 10px;
}
.search_filters {
- display: inline-block;
- margin: 0.8rem 0 0 0;
+ margin: 0.6rem 0 0 @results-offset + 0.6rem;
+
+ select {
+ background-color: inherit;
+
+ &:hover,
+ &:focus {
+ color: var(--color-base-font);
+ }
+ }
}
@media screen and (max-width: @tablet) {
- #search {
+ #search_header {
padding: 1.5em @results-tablet-offset 0 @results-tablet-offset;
column-gap: @results-tablet-offset;
}
+ .search_filters {
+ margin: 0.6rem 0 0 @results-tablet-offset + 3rem;
+ }
+
#categories {
font-size: 90%;
clear: both;
@@ -200,10 +217,10 @@
}
@media screen and (max-width: @phone) {
- #search {
+ #search_header {
width: 100%;
margin: 0;
- padding: 0.1em 0 0 0;
+ padding: 0.1rem 0 0 0;
column-gap: 0;
row-gap: 0;
grid-template-areas:
@@ -215,16 +232,9 @@
padding: 0;
}
- #search_wrapper {
- width: 100%;
- padding: 0;
- }
-
.search_box {
// hack, should be 100% ?
width: 99%;
- margin: 0.1em;
- padding: 0 0.1em 0 0;
display: flex;
flex-direction: row;
}
@@ -240,8 +250,7 @@
}
.search_filters {
- display: block;
- margin: 0.8em 0;
+ margin: 0;
}
.language,
@@ -266,7 +275,7 @@
}
@media screen and (max-width: @ultra-small-phone) {
- #search {
+ #search_header {
grid-template-areas:
"search search"
"categories categories";
diff --git a/searx/static/themes/simple/src/less/style.less b/searx/static/themes/simple/src/less/style.less
index a26c57db1..a5c050f20 100644
--- a/searx/static/themes/simple/src/less/style.less
+++ b/searx/static/themes/simple/src/less/style.less
@@ -168,7 +168,7 @@ article[data-vim-selected].category-social {
border-left: 0.2rem solid transparent;
h3 {
- font-size: 1.1em;
+ font-size: 1.2rem;
word-wrap: break-word;
margin: 0.4rem 0 0.4rem 0;
padding: 0;
@@ -221,13 +221,39 @@ article[data-vim-selected].category-social {
}
}
- .url {
- font-size: 0.96em;
- margin: 0 0 3px 0;
- padding: 0;
- max-width: 54em;
- word-wrap: break-word;
+ .url_wrapper {
+ display: flex;
+ font-size: 1rem;
color: var(--color-result-url-font);
+ flex-wrap: nowrap;
+ overflow: hidden;
+ flex-direction: row;
+ margin: 0;
+ padding: 0;
+
+ .url_o1 {
+ white-space: nowrap;
+ flex-shrink: 1;
+ }
+
+ .url_o1::after {
+ content: " ";
+ width: 1ch;
+ display: inline-block;
+ }
+
+ .url_o2 {
+ overflow: hidden;
+ white-space: nowrap;
+ flex-basis: content;
+ flex-grow: 0;
+ flex-shrink: 1;
+ text-align: right;
+
+ .url_i2 {
+ float: right;
+ }
+ }
}
.published_date {
@@ -238,17 +264,15 @@ article[data-vim-selected].category-social {
img {
&.thumbnail {
float: left;
- padding: 0 5px 10px 0;
- width: 20em;
- min-width: 20em;
- min-height: 8em;
+ padding: 0.6rem 1rem 0 0;
+ width: 20rem;
}
&.image {
float: left;
- padding: 0 5px 10px 0;
- width: 100px;
- max-height: 100px;
+ padding: 0.6rem 1rem 0 0;
+ width: 7rem;
+ max-height: 7rem;
object-fit: scale-down;
object-position: right top;
}
@@ -367,7 +391,7 @@ article[data-vim-selected].category-social {
}
#results {
- margin: 2rem 2rem 0 @results-offset;
+ margin: 1rem 2rem 0 @results-offset;
display: grid;
grid-template-columns: @results-width 25rem;
grid-template-rows: min-content min-content 1fr min-content;
@@ -686,7 +710,7 @@ article[data-vim-selected].category-social {
}
#main_results div#results {
- margin: 2rem auto 0 auto;
+ margin: 1rem auto 0 auto;
justify-content: center;
display: grid;
grid-template-columns: @results-width;
@@ -702,7 +726,7 @@ article[data-vim-selected].category-social {
}
#main_results div#results.only_template_images {
- margin: 2rem @results-tablet-offset 0 @results-tablet-offset;
+ margin: 1rem @results-tablet-offset 0 @results-tablet-offset;
display: grid;
grid-template-columns: 100%;
grid-template-rows: min-content min-content 1fr min-content min-content;
diff --git a/searx/static/themes/simple/src/less/toolkit.less b/searx/static/themes/simple/src/less/toolkit.less
index f8ae3c1bb..da207f1f5 100644
--- a/searx/static/themes/simple/src/less/toolkit.less
+++ b/searx/static/themes/simple/src/less/toolkit.less
@@ -296,11 +296,11 @@ html body .tabs > input:checked {
/* -- select -- */
select {
- height: 28px;
- margin: 0 1em 0 0;
- padding: 2px 8px 2px 0 !important;
+ height: 2.4rem;
+ margin: 0 1rem 0 0;
+ padding: 0.2rem !important;
color: var(--color-search-font);
- font-size: 12px;
+ font-size: 0.9rem;
z-index: 2;
&:hover,
@@ -314,17 +314,20 @@ select {
appearance: none;
-webkit-appearance: none;
-moz-appearance: none;
- border: none;
- border-bottom: 1px solid var(--color-toolkit-select-border);
+ border-width: 0 2rem 0 0;
+ border-color: transparent;
background: data-uri('image/svg+xml;charset=UTF-8', @select-light-svg-path) no-repeat;
- background-position-x: 105%;
- background-size: 2em;
+ background-position-x: calc(100% + 2rem);
+ background-size: 2rem;
background-origin: content-box;
+ background-color: var(--color-toolkit-select-background);
outline: medium none;
+ text-overflow: ellipsis;
+ .rounded-corners-tiny;
&:hover,
&:focus {
- border-bottom: 1px solid var(--color-toolkit-select-border-hover);
+ background-color: var(--color-toolkit-select-background-hover);
}
option {
diff --git a/searx/templates/simple/categories.html b/searx/templates/simple/categories.html
index 29616f127..ae8b2ec09 100644
--- a/searx/templates/simple/categories.html
+++ b/searx/templates/simple/categories.html
@@ -13,6 +13,7 @@
} -%}
<div id="categories" class="search_categories">{{- '' -}}
<div id="categories_container">
+ {%- if display_tooltip %}<div class="help">{{ _('Click on the magnifier to perform search') }}</div>{% endif -%}
{%- for category in categories -%}
<div class="category"><input type="checkbox" id="checkbox_{{ category|replace(' ', '_') }}" name="category_{{ category }}"{% if category in selected_categories %} checked="checked"{% endif %}/>
<label for="checkbox_{{ category|replace(' ', '_') }}" class="tooltips">
@@ -21,6 +22,5 @@
</label>
</div>
{%- endfor -%}
- {%- if display_tooltip %}<div class="help">{{ _('Click on the magnifier to perform search') }}</div>{% endif -%}
</div>{{- '' -}}
</div>
diff --git a/searx/templates/simple/languages.html b/searx/templates/simple/filters/languages.html
similarity index 97%
rename from searx/templates/simple/languages.html
rename to searx/templates/simple/filters/languages.html
index dd928ff68..710c18c92 100644
--- a/searx/templates/simple/languages.html
+++ b/searx/templates/simple/filters/languages.html
@@ -1,4 +1,4 @@
-<select class="language" id="language" name="language" tabindex="2">{{- '' -}}
+<select class="language" id="language" name="language" tabindex="1">{{- '' -}}
<option value="all" {% if current_language == 'all' %}selected="selected"{% endif %}>{{ _('Default language') }}</option>
{%- for lang_id,lang_name,country_name,english_name in language_codes | sort(attribute=1) -%}
<option value="{{ lang_id }}" {% if lang_id == current_language %}selected="selected"{% endif %}>
diff --git a/searx/templates/simple/filters/safesearch.html b/searx/templates/simple/filters/safesearch.html
new file mode 100644
index 000000000..a146e6710
--- /dev/null
+++ b/searx/templates/simple/filters/safesearch.html
@@ -0,0 +1,5 @@
+<select name="safesearch" id="safesearch" class="safesearch" tabindex="3">
+ <option value="2" {% if safesearch == '2' %}selected="selected"{% endif %}>{{ _("SafeSearch") + ": " + _('Strict') }}</option>
+ <option value="1" {% if safesearch == '1' %}selected="selected"{% endif %}>{{ _("SafeSearch") + ": " + _('Moderate') }}</option>
+ <option value="0" {% if safesearch == '0' %}selected="selected"{% endif %}>{{ _("SafeSearch") + ": " + _('None') }}</option>
+</select>
diff --git a/searx/templates/simple/time-range.html b/searx/templates/simple/filters/time_range.html
similarity index 97%
rename from searx/templates/simple/time-range.html
rename to searx/templates/simple/filters/time_range.html
index a9fc9f165..2c85edf92 100644
--- a/searx/templates/simple/time-range.html
+++ b/searx/templates/simple/filters/time_range.html
@@ -1,4 +1,4 @@
-<select name="time_range" id="time_range" class="time_range" tabindex="3">{{- '' -}}
+<select name="time_range" id="time_range" class="time_range" tabindex="2">{{- '' -}}
<option id="time-range-anytime" value="" {{ "selected" if time_range=="" or not time_range else ""}}>
{{- _('Anytime') -}}
</option>{{- '' -}}
diff --git a/searx/templates/simple/macros.html b/searx/templates/simple/macros.html
index 26aa71891..7a3a4ff9f 100644
--- a/searx/templates/simple/macros.html
+++ b/searx/templates/simple/macros.html
@@ -18,7 +18,11 @@
<!-- Draw result header -->
{% macro result_header(result, favicons, image_proxify) -%}
<article class="result {% if result['template'] %}result-{{ result.template|replace('.html', '') }}{% else %}result-default{% endif %} {% if result['category'] %}category-{{ result['category'] }}{% endif %}{% for e in result.engines %} {{ e }}{% endfor %}">
- <p class="url">{{ result_link(result.url, result.pretty_url, 'url') }}</p>
+ {{- result_open_link(result.url, "url_wrapper") -}}
+ {%- for part in get_pretty_url(result.parsed_url) -%}
+ <span class="url_o{{loop.index}}"><span class="url_i{{loop.index}}">{{- part -}}</span></span>
+ {%- endfor %}
+ {{- result_close_link() -}}
{%- if result.img_src %}{{ result_open_link(result.url) }}<img class="image" src="{{ image_proxify(result.img_src) }}" alt="{{ result.title|striptags }}" title="{{ result.title|striptags }}" class="image" />{{ result_close_link() }}{% endif -%}
{%- if result.thumbnail %}{{ result_open_link(result.url) }}<img class="thumbnail" src="{{ image_proxify(result.thumbnail) }}" title="{{ result.title|striptags }}" alt="{{ result.title|striptags }}"/>{{ result_close_link() }}{% endif -%}
<h3>{{ result_link(result.url, result.title|safe) }}</h3>
diff --git a/searx/templates/simple/search.html b/searx/templates/simple/search.html
index c231d7b35..1df55e782 100644
--- a/searx/templates/simple/search.html
+++ b/searx/templates/simple/search.html
@@ -1,22 +1,22 @@
<form id="search" method="{{ method or 'POST' }}" action="{{ url_for('search') }}">
- <a id="search_logo" href="{{ url_for('index') }}">
- <span hidden>SearXNG</span>
- {% include '__common__/searxng-wordmark.min.svg' without context %}
- </a>
- <div id="search_wrapper">
+ <div id="search_header">
+ <a id="search_logo" href="{{ url_for('index') }}">
+ <span hidden>SearXNG</span>
+ {% include '__common__/searxng-wordmark.min.svg' without context %}
+ </a>
<div class="search_box">
<input id="q" autofocus name="q" type="text" placeholder="{{ _('Search for...') }}" tabindex="1" autocomplete="off" spellcheck="false" dir="auto" {% if q %}value="{{ q }}"{% endif %} >
- <button id="clear_search" type="button" tabindex="-1"><span class="hide_if_nojs">{{ icon_big('close') }}</span><span class="show_if_nojs">{{ _('Clear search') }}</span></button>
- <button id="send_search" type="submit" tabindex="-1"><span class="hide_if_nojs">{{ icon_big('search-outline') }}</span><span class="show_if_nojs">{{ _('Start search') }}</span></button>
- </div>
- <div class="search_filters">
- {% include 'simple/languages.html' %}
- {% include 'simple/time-range.html' %}
+ <button id="clear_search" type="button" tabindex="-1"><span class="hide_if_nojs">{{ icon_big('close') }}</span><span class="show_if_nojs">{{ _('clear') }}</span></button>
+ <button id="send_search" type="submit" tabindex="-1"><span class="hide_if_nojs">{{ icon_big('search-outline') }}</span><span class="show_if_nojs">{{ _('search') }}</span></button>
</div>
+ {% set display_tooltip = true %}
+ {% include 'simple/categories.html' %}
+ </div>
+ <div class="search_filters">
+ {% include 'simple/filters/languages.html' %}
+ {% include 'simple/filters/time_range.html' %}
+ {% include 'simple/filters/safesearch.html' %}
</div>
- {% set display_tooltip = true %}
- {% include 'simple/categories.html' %}
- <input type="hidden" name="safesearch" value="{{ safesearch }}" >
<input type="hidden" name="theme" value="{{ theme }}" >
{% if timeout_limit %}<input type="hidden" name="timeout_limit" value="{{ timeout_limit|e }}" >{% endif %}
</form>
diff --git a/searx/templates/simple/simple_search.html b/searx/templates/simple/simple_search.html
index 8612ceca6..6a5cdd9e7 100644
--- a/searx/templates/simple/simple_search.html
+++ b/searx/templates/simple/simple_search.html
@@ -1,9 +1,9 @@
<form id="search" method="{{ method or 'POST' }}" action="{{ url_for('search') }}">
- <div id="search_wrapper">
+ <div id="search_header">
<div class="search_box">
<input id="q" autofocus name="q" type="text" placeholder="{{ _('Search for...') }}" tabindex="1" autocomplete="off" spellcheck="false" dir="auto" {% if q %}value="{{ q }}"{% endif %} >
- <button id="clear_search" type="button" tabindex="-1"><span class="hide_if_nojs">{{ icon_big('close') }}</span><span class="show_if_nojs">{{ _('Clear search') }}</span></button>
- <button id="send_search" type="submit" tabindex="-1"><span class="hide_if_nojs">{{ icon_big('search-outline') }}</span><span class="show_if_nojs">{{ _('Start search') }}</span></button>
+ <button id="clear_search" type="button" tabindex="-1"><span class="hide_if_nojs">{{ icon_big('close') }}</span><span class="show_if_nojs">{{ _('clear') }}</span></button>
+ <button id="send_search" type="submit" tabindex="-1"><span class="hide_if_nojs">{{ icon_big('search-outline') }}</span><span class="show_if_nojs">{{ _('search') }}</span></button>
</div>
</div>
</form>
diff --git a/searx/webapp.py b/searx/webapp.py
index 4dd7ec723..6039be547 100755
--- a/searx/webapp.py
+++ b/searx/webapp.py
@@ -419,6 +419,16 @@ def _get_enable_categories(all_categories):
return [x for x in all_categories if x in enabled_categories]
+def get_pretty_url(parsed_url):
+ path = parsed_url.path
+ path = path[:-1] if len(path) > 0 and path[-1] == '/' else path
+ path = path.replace("/", " › ")
+ return [
+ parsed_url.scheme + "://" + parsed_url.netloc,
+ path
+ ]
+
+
def render(template_name, override_theme=None, **kwargs):
# values from the HTTP requests
kwargs['endpoint'] = 'results' if 'q' in kwargs else request.endpoint
@@ -457,6 +467,7 @@ def render(template_name, override_theme=None, **kwargs):
kwargs['searx_version'] = VERSION_STRING
kwargs['searx_git_url'] = GIT_URL
kwargs['get_setting'] = get_setting
+ kwargs['get_pretty_url'] = get_pretty_url
# helpers to create links to other pages
kwargs['url_for'] = url_for_theme # override url_for function in templates
From b0aebf7069236ba53078b7d5adf6c678df56693b Mon Sep 17 00:00:00 2001
From: mrpaulblack <paul@paulgo.io>
Date: Sun, 21 Nov 2021 21:40:49 +0100
Subject: [PATCH 2/2] [build] /static
---
.../oscar/css/logicodev-dark.min.css.map | Bin 11613 -> 11613 bytes
.../static/themes/simple/css/searxng-rtl.css | 171 +++++++++++-------
.../themes/simple/css/searxng-rtl.min.css | Bin 56682 -> 57580 bytes
.../themes/simple/css/searxng-rtl.min.css.map | Bin 24260 -> 24552 bytes
searx/static/themes/simple/css/searxng.css | 171 +++++++++++-------
.../static/themes/simple/css/searxng.min.css | Bin 56643 -> 57541 bytes
.../themes/simple/css/searxng.min.css.map | Bin 24204 -> 24496 bytes
searx/static/themes/simple/img/favicon.png | Bin 4734 -> 11114 bytes
searx/static/themes/simple/js/searxng.js | 1 +
searx/static/themes/simple/js/searxng.min.js | Bin 25028 -> 25076 bytes
.../themes/simple/js/searxng.min.js.map | Bin 31456 -> 31502 bytes
11 files changed, 217 insertions(+), 126 deletions(-)
diff --git a/searx/static/themes/oscar/css/logicodev-dark.min.css.map b/searx/static/themes/oscar/css/logicodev-dark.min.css.map
index eafe5f3484fa2a3dccf2ca9963b6f47a0cea5c1d..32293f3a43cc80ffe3356a30a41c213dc1fbcf2d 100644
GIT binary patch
delta 46
zcmV+}0MY;5THRWZd6QfM7O{xb0g-tRliL9avwH$cAOS;@#v*P3VzV_PfCB+zv$iIu
E2EVHjb^rhX
delta 55
zcmV-70LcH{THRWZc>`l_WRW)?k;Wvk#+?C?c@~lZ1d}iV1+#ksN+1DRlg1)$0b#Q>
NBY*<|L$kIfrv_n}6ZZfB
diff --git a/searx/static/themes/simple/css/searxng-rtl.css b/searx/static/themes/simple/css/searxng-rtl.css
index e5e5a6875..6087a6aa5 100644
--- a/searx/static/themes/simple/css/searxng-rtl.css
+++ b/searx/static/themes/simple/css/searxng-rtl.css
@@ -802,11 +802,10 @@ template {
--color-toolkit-dialog-background: #fff;
--color-toolkit-tabs-label-border: #fff;
--color-toolkit-tabs-section-border: #ddd;
+ --color-toolkit-select-background: #f7f7f7;
--color-toolkit-select-border: #ddd;
- --color-toolkit-select-border-hover: #bbb;
+ --color-toolkit-select-background-hover: #bbb;
--color-toolkit-input-text-font: #222;
- --color-toolkit-input-text-border: #ddd;
- --color-toolkit-input-text-border-hover: #bbb;
--color-toolkit-checkbox-onoff-background: #ddd;
--color-toolkit-checkbox-onoff-label-background: #3050ff;
--color-toolkit-checkbox-onoff-checked-background: #aaa;
@@ -863,8 +862,8 @@ template {
--color-result-link-font: #8af;
--color-result-link-font-highlight: #8af;
--color-result-link-visited-font: #96b;
- --color-result-publishdate-font: #777;
- --color-result-engines-font: #777;
+ --color-result-publishdate-font: #888;
+ --color-result-engines-font: #888;
--color-result-search-url-border: #555;
--color-result-search-url-font: #fff;
--color-result-detail-font: #fff;
@@ -887,11 +886,10 @@ template {
--color-toolkit-dialog-background: #222;
--color-toolkit-tabs-label-border: #222;
--color-toolkit-tabs-section-border: #555;
+ --color-toolkit-select-background: #3c3b31;
--color-toolkit-select-border: #555;
- --color-toolkit-select-border-hover: #777;
+ --color-toolkit-select-background-hover: #333;
--color-toolkit-input-text-font: #fff;
- --color-toolkit-input-text-border: #555;
- --color-toolkit-input-text-border-hover: #777;
--color-toolkit-checkbox-onoff-background: #3c3b31;
--color-toolkit-checkbox-onoff-label-background: #58f;
--color-toolkit-checkbox-onoff-checked-background: #ddd;
@@ -948,8 +946,8 @@ template {
--color-result-link-font: #8af;
--color-result-link-font-highlight: #8af;
--color-result-link-visited-font: #96b;
- --color-result-publishdate-font: #777;
- --color-result-engines-font: #777;
+ --color-result-publishdate-font: #888;
+ --color-result-engines-font: #888;
--color-result-search-url-border: #555;
--color-result-search-url-font: #fff;
--color-result-detail-font: #fff;
@@ -972,11 +970,10 @@ template {
--color-toolkit-dialog-background: #222;
--color-toolkit-tabs-label-border: #222;
--color-toolkit-tabs-section-border: #555;
+ --color-toolkit-select-background: #3c3b31;
--color-toolkit-select-border: #555;
- --color-toolkit-select-border-hover: #777;
+ --color-toolkit-select-background-hover: #333;
--color-toolkit-input-text-font: #fff;
- --color-toolkit-input-text-border: #555;
- --color-toolkit-input-text-border-hover: #777;
--color-toolkit-checkbox-onoff-background: #3c3b31;
--color-toolkit-checkbox-onoff-label-background: #58f;
--color-toolkit-checkbox-onoff-checked-background: #ddd;
@@ -1653,11 +1650,11 @@ html body .tabs > input:checked + label + section {
}
/* -- select -- */
select {
- height: 28px;
- margin: 0 1em 0 0;
- padding: 2px 8px 2px 0 !important;
+ height: 2.4rem;
+ margin: 0 1rem 0 0;
+ padding: 0.2rem !important;
color: var(--color-search-font);
- font-size: 12px;
+ font-size: 0.9rem;
z-index: 2;
}
select:hover,
@@ -1669,17 +1666,22 @@ select:focus {
appearance: none;
-webkit-appearance: none;
-moz-appearance: none;
- border: none;
- border-bottom: 1px solid var(--color-toolkit-select-border);
+ border-width: 0 2rem 0 0;
+ border-color: transparent;
background: url("data:image/svg+xml;charset=UTF-8,%3C%3Fxml%20version%3D%221.0%22%20encoding%3D%22utf-8%22%3F%3E%0A%3Csvg%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20width%3D%22512%22%20height%3D%22512%22%20viewBox%3D%220%200%20512%20512%22%3E%0A%3Cg%3E%3Cpolygon%20points%3D%22128%2C192%20256%2C320%20384%2C192%22%2F%3E%3C%2Fg%3E%0A%3C%2Fsvg%3E") no-repeat;
- background-position-x: 105%;
- background-size: 2em;
+ background-position-x: calc(100% + 2rem);
+ background-size: 2rem;
background-origin: content-box;
+ background-color: var(--color-toolkit-select-background);
outline: medium none;
+ text-overflow: ellipsis;
+ -webkit-border-radius: 5px;
+ -moz-border-radius: 5px;
+ border-radius: 5px;
}
select:hover,
select:focus {
- border-bottom: 1px solid var(--color-toolkit-select-border-hover);
+ background-color: var(--color-toolkit-select-background-hover);
}
select option {
background-color: var(--color-base-background);
@@ -2203,7 +2205,8 @@ article.result-images .detail {
font-size: 4em;
visibility: hidden;
}
-.index #search {
+.index #search,
+.index #search_header {
margin: 0 auto;
background: inherit;
border: inherit;
@@ -2267,15 +2270,17 @@ article.result-images .detail {
#main_preferences .value input[type="text"] {
width: 13.25rem;
color: var(--color-toolkit-input-text-font);
- border: 1px solid var(--color-toolkit-input-text-border);
- background: none repeat scroll 0 0 var(--color-base-background);
- padding: 0.4rem;
+ border: none;
+ background: none repeat scroll 0 0 var(--color-toolkit-select-background);
+ padding: 0.2rem 0.4rem;
+ height: 2rem;
-webkit-border-radius: 5px;
-moz-border-radius: 5px;
border-radius: 5px;
}
-#main_preferences .value input[type="text"]:hover {
- border: 1px solid var(--color-toolkit-input-text-border-hover);
+#main_preferences .value input[type="text"]:hover,
+#main_preferences .value input[type="text"]:focus {
+ background-color: var(--color-toolkit-select-background-hover);
}
#main_preferences .value select:focus,
#main_preferences .value input:focus {
@@ -2319,6 +2324,19 @@ article.result-images .detail {
#main_preferences table.cookies > tbody > tr:nth-child(even) > td {
background-color: var(--color-settings-tr-hover);
}
+#main_preferences .category {
+ margin-right: 0.5rem;
+}
+#main_preferences .category label {
+ border: 2px solid transparent;
+ padding: 0.2rem 0.4rem;
+ -webkit-border-radius: 5px;
+ -moz-border-radius: 5px;
+ border-radius: 5px;
+}
+#main_preferences .category input[type="checkbox"]:checked + label {
+ border: 2px solid var(--color-categories-item-border-selected);
+}
#main_preferences .name,
#main_preferences .shortcut {
text-align: left;
@@ -2364,6 +2382,10 @@ article.result-images .detail {
* SearXNG, A privacy-respecting, hackable metasearch engine
*/
#search {
+ padding: 0;
+ margin: 0;
+}
+#search_header {
padding: 1.5em 2em 0 7rem;
margin: 0;
background: var(--color-header-background);
@@ -2422,12 +2444,10 @@ article.result-images .detail {
.search_categories {
grid-area: categories;
}
-#search_wrapper {
+.search_box {
+ margin: 0;
padding: 0;
grid-area: search;
-}
-.search_box {
- margin: 0 12px 0 0;
display: inline-flex;
flex-direction: row;
white-space: nowrap;
@@ -2492,18 +2512,30 @@ article.result-images .detail {
background-color: var(--color-search-background-hover);
color: var(--color-search-background);
}
+.no-js #clear_search,
.no-js #send_search {
width: auto !important;
+ border-left: 1px solid var(--color-search-border);
+ padding: 10px;
}
.search_filters {
- display: inline-block;
- margin: 0.8rem 0 0 0;
+ margin: 0.6rem 0 0 10.6rem;
+}
+.search_filters select {
+ background-color: inherit;
+}
+.search_filters select:hover,
+.search_filters select:focus {
+ color: var(--color-base-font);
}
@media screen and (max-width: 80em) {
- #search {
+ #search_header {
padding: 1.5em 0.5rem 0 0.5rem;
column-gap: 0.5rem;
}
+ .search_filters {
+ margin: 0.6rem 0 0 3.5rem;
+ }
#categories {
font-size: 90%;
clear: both;
@@ -2534,10 +2566,10 @@ article.result-images .detail {
}
}
@media screen and (max-width: 50em) {
- #search {
+ #search_header {
width: 100%;
margin: 0;
- padding: 0.1em 0 0 0;
+ padding: 0.1rem 0 0 0;
column-gap: 0;
row-gap: 0;
grid-template-areas: "logo search" "categories categories";
@@ -2545,14 +2577,8 @@ article.result-images .detail {
.search_logo {
padding: 0;
}
- #search_wrapper {
- width: 100%;
- padding: 0;
- }
.search_box {
width: 99%;
- margin: 0.1em;
- padding: 0 0.1em 0 0;
display: flex;
flex-direction: row;
}
@@ -2565,8 +2591,7 @@ article.result-images .detail {
transition: margin-right 0.1s;
}
.search_filters {
- display: block;
- margin: 0.8em 0;
+ margin: 0;
}
.language,
.time_range {
@@ -2586,7 +2611,7 @@ article.result-images .detail {
}
}
@media screen and (max-width: 20rem) {
- #search {
+ #search_header {
grid-template-areas: "search search" "categories categories";
}
#search_logo {
@@ -2744,7 +2769,7 @@ article[data-vim-selected].category-social {
border-left: 0.2rem solid transparent;
}
.result h3 {
- font-size: 1.1em;
+ font-size: 1.2rem;
word-wrap: break-word;
margin: 0.4rem 0 0.4rem 0;
padding: 0;
@@ -2789,13 +2814,35 @@ article[data-vim-selected].category-social {
background: inherit;
font-weight: normal;
}
-.result .url {
- font-size: 0.96em;
- margin: 0 0 3px 0;
- padding: 0;
- max-width: 54em;
- word-wrap: break-word;
+.result .url_wrapper {
+ display: flex;
+ font-size: 1rem;
color: var(--color-result-url-font);
+ flex-wrap: nowrap;
+ overflow: hidden;
+ flex-direction: row;
+ margin: 0;
+ padding: 0;
+}
+.result .url_wrapper .url_o1 {
+ white-space: nowrap;
+ flex-shrink: 1;
+}
+.result .url_wrapper .url_o1::after {
+ content: " ";
+ width: 1ch;
+ display: inline-block;
+}
+.result .url_wrapper .url_o2 {
+ overflow: hidden;
+ white-space: nowrap;
+ flex-basis: content;
+ flex-grow: 0;
+ flex-shrink: 1;
+ text-align: right;
+}
+.result .url_wrapper .url_o2 .url_i2 {
+ float: right;
}
.result .published_date {
font-size: 0.8em;
@@ -2803,16 +2850,14 @@ article[data-vim-selected].category-social {
}
.result img.thumbnail {
float: left;
- padding: 0 5px 10px 0;
- width: 20em;
- min-width: 20em;
- min-height: 8em;
+ padding: 0.6rem 1rem 0 0;
+ width: 20rem;
}
.result img.image {
float: left;
- padding: 0 5px 10px 0;
- width: 100px;
- max-height: 100px;
+ padding: 0.6rem 1rem 0 0;
+ width: 7rem;
+ max-height: 7rem;
object-fit: scale-down;
object-position: right top;
}
@@ -2910,7 +2955,7 @@ article[data-vim-selected].category-social {
display: none !important;
}
#results {
- margin: 2rem 2rem 0 10rem;
+ margin: 1rem 2rem 0 10rem;
display: grid;
grid-template-columns: 45rem 25rem;
grid-template-rows: min-content min-content 1fr min-content;
@@ -3174,7 +3219,7 @@ article[data-vim-selected].category-social {
margin: 2rem 0 0 0 !important;
}
#main_results div#results {
- margin: 2rem auto 0 auto;
+ margin: 1rem auto 0 auto;
justify-content: center;
display: grid;
grid-template-columns: 45rem;
@@ -3184,7 +3229,7 @@ article[data-vim-selected].category-social {
}
}
#main_results div#results.only_template_images {
- margin: 2rem 0.5rem 0 0.5rem;
+ margin: 1rem 0.5rem 0 0.5rem;
display: grid;
grid-template-columns: 100%;
grid-template-rows: min-content min-content 1fr min-content min-content;
diff --git a/searx/static/themes/simple/css/searxng-rtl.min.css b/searx/static/themes/simple/css/searxng-rtl.min.css
index f7746b5a907510cb3453a47113609e21ec5bdbb4..eecac2bac6e63e395681aa178785c9a8d3f6f3d7 100644
GIT binary patch
delta 1549
zcmb_cO>7%Q6qfBYN#&%tZDLZ#EsKL&JN0gNT^quzgs6l>C4Quynu64@-W_{~Zg;n{
z>)ORl%LO4MF6Bu`D3yYc0&S^Cq6H3Z4#}w?E<{3w3tW*3h@V4`h*|G$ni!fBr}=sB
zeeZqWyf^o5C4OB?EL|LjzxHH+92$k6GiiAF(BMu*J=368)6`&pHVdocdH68<h<7|&
zA4p71O~LZSfj+j%aOL?7q{arl8%LA`OcZh~`0(&XFt1zZ;qS^A1K16(9UbvO;COb(
z6AIP;3uq<g%~x}|yilR|tbA6X4PqjZlh}z9IZ?J1O(SLl31xNzznrY>5T5pT6Vvx6
z`4-V!oq7AVu6NC%8m7Ez85Tt@RZPcLC^lX1)Ty^)PpFEa79>&3bBDVjMY;BXt3%$v
zs7&GhD~|*B<$fk-D!E}T%5d(+2ymCukg^_yKfd8Xn9jf*yX*HrZtv2o({j2b5L3f#
zZo<I|RrMJiE37K-?)#r7`b^8j@Y(evKK|q;{4G4WKn)#}hVHVW7~deR058rJ`|Fn4
zbV_jS>RvcKcL2V!vp(9UDwgLK6631k;)X>pbOKR%+65D;KHB=#z0V4f17|2TY;*$c
zP}y#Cj%5&y+oa#tX9&vMRMH+W7fOQ>0Ia_-3coMpyyxamCLr@ga#xQK?|t-4Us4Fg
zsab6}@xch(`#1&PzCPlWKDpI5tQt(YnZTn2KYdyllEbGpaNUJt*ABiE2_}hldo}{A
z6T`*S2`MAt$*?gvN$l=>9XSUZSamzFRvoK6#E1g9ds2jv@Y}V0@T0LaRs`<5{P30s
z2Xa%$^@RPqvZLOWo6Yz@*d)-u_*jfWe(@aKUQEMUGYdmY?+k=<0gFp_BTw(G<$cL`
znR@dpf5vk&EvncyrX7tqwxL`=bpyBMx@Ee2x3MJ(;`%7O`R)L$qz9`-*|+n45Hc-)
zk*)KX)(xwLbfRh43>-8<nLNZY5w%*7vPUmd>@*FR6PnbBas~%W>a=v?VxEnhiX+r+
z8b_zZJcFcJVVh`#lsbF6j>>9g6N_?OP7dZ<Qgu0^1?cOc%iH0UJH136R#i=Lh=am(
z0bTZIwvZU?qoQROw_RQ_NP~&skI<~R4UKXj1}S%#mWmrhKz#M$SkQ|b|5`w;EK*or
rEfoLL_!Mhi_9M3W@E`EcUVLp=e@yar-^r!eQu%%|#+I2Mk~{tZF^@e?
delta 921
zcmcIiUr19?9OinR6E|Zy|CC$nxFK`Wy`4LqTX#^sWKYpkC|ayLcinEbd$;S#(Ub^+
zo}$$+5~ETfL<lWCQ6wQo(t{x7Lk0O@LQf%4Jrq4e-FsaI=4($s&hPhq-|w97J8RGA
zk2Caxeg}*>JT^s*i7Jy&&WbAUiAJMv)$4{|j!O9Cu)u1qQ?J{j|DZT0f`v#K+2cHJ
zhOaetP+nN!b4>$z=@Dq?@NN<g27{V#iy><DZY8QC{)oQ!2LFfXEJc`r+ua;WWy489
zjY~3*5ho@QMmU@jVlhdM^Zry8X#k{GTqh+{ikcDR45UZxaPqYkZns&AIc*3NZQo41
ztjHpylXhTRE3S2y!W~CB<s*yjm#AtE2kOI7p{pmZDre*v(<_}5c|T-3>R_qE4*NTu
z@cmdhG`3b3h~!FVdzk#Z@sI}QbQ$1RR(+t^Z(g_G2M6!%g@(sFO>DC&CZSHLf&5_x
zj*i%2WvB!qH*IF#2r>uh-dzQ<$sogpVP^qkBCcEKX|ghMh$gLf1I0E^uPCTpiAbL+
zq*9`qgZy}{Yk)0uqe?dS*DS*ogkkkmC7B(cDTd1vh#G(+gFE2IXr+Y>X&2M&)F8I&
zE|`03hPlZSSe#^u=e|+|LsPrq$yD00d1s##%OrRX<N7e5Y2+$wWVLiQlEFwn8rlb@
z$Kb?Zm5B{$4Op9gL**c{Tt!w0ZJ{{wVfITA%5^JpX5DpmUyG)*@d}KZv~VFmhoNVw
z0w(ficv@Xb`C#~Ye-lOlZOCCg{_y&>{8(p8GPCKJ5T$q`!-t@0zQMNzPkWB>)3Qtf
cX*9^i`E4bXpTL6Krj<wU8Y!);E?Z2$0Z749y#N3J
diff --git a/searx/static/themes/simple/css/searxng-rtl.min.css.map b/searx/static/themes/simple/css/searxng-rtl.min.css.map
index 048871108407bf22be48b9f3fe9dce0471561d96..e33316f94c54abf4483607412fe09a426633d74d 100644
GIT binary patch
delta 1223
zcmah|O-vI(6wYiHW5fh#DM%B3j3h=o0cy2iMC{D6yIsn%tyF83kbqRMMfnpdUJQwe
zUi`}oCnb@)iH0>^)EJF19`vS(XAZ_ACohJ?d9xHf7`;s1%=`Ji@4YwgUXkyw$y2|-
zzNj(AXqst^c5yV5XqI5LHV6fOC1m`g)g`m2(MuZBIyt?_*|huKzoGmy^HxJ)SCO-<
ziSZG4r0&1*m&g(KM?+l=ao|`_s9A7GBb#xKbZo{Px+u&PJ%z6}WWqKXfp|}Fw{VZ(
zTTTSRn{d#a=Ttyz3mlWng2c;K3^HOxPUnT5N$#OI+i~a78q}hL1~lz!3dIIZQN0%-
zbgi5j)0jE!?xin?TF6asxZmIC>n-Ni+Nyjc3e}Mo5_Thz8w!cK&!azgs*KKYc+&lh
zMBK6CtpwtFYYU=Z);x3@F>Tc8@#vf7eFD8PV9oO+9q&baaY_R2W>1D3JuLL;f|JbC
z85KhmcbRQ@kHUiu`4gaT!H{Jutqx;Rqv2lBBiQH(D&{me@gXH)NF~-x0zSoGs>wc@
zhK*QIH4U0~Z?ga)XJD1bNdngSM^#kUA)X5n$6eR%DBUx1P*dXU$8j;5NBA6CWlCZ&
zhrGea(I%OwjPuput`Ur-nGiCMSJ`KzZfZ2fQN1{YdQsNFh-3$s+c>MyJggb}E4GV>
z<@sWK-XWlMu_LQ203A*REE_fO)$D`=i7Ggk$cUiVi8+#osI}iWk=7wnTMwahC0w@}
zNf)eG2T7;<!Fr%pIw(OdTo#tJfV(t637LUZrWQ`LS6r8T1hw*3%J4x{EUmn!y*yTZ
zdmK6{#XQ~XkBpX`(wUj0Q(~C?-ry|Ek=>M*Y}*L74YO^X{sxojvQQRb<$spUCG1vl
zQA~PmBrqd)Mi#eOasW1+NJ!q2SU~rVGQ15#sfOTR-N4cTSV>)07EZ!yu31?;>9(bp
zRo}Hy{6dXByK5A_odV_R7~Ja@?lE|H`lhcvkK5Lyj9+k#>={KVOv0mFi&C6)-{wMU
i#YBlu<Hu@JiX|Y!Vf9LhdkLiyq=wHb*B0UN@Sb0bS7DF<
delta 974
zcmaiy&rcIU6vs2WwF+W@%927t(WoJz6Q$x0NHj1rU6yTKmMvfliINJWP*hq-p^y-4
zqVeSE#ghm96NE{;XhjnfFJib5kKT+Y;qJwmDFOAuW%IJ{`{sSV@4cU!=u;WJ4g`W-
zln{dBgb_T)4#EtBlF@*cpcF8`4&19-wq_ZAzzDle@eC#N{B2-QJF0lgSk*hNeqIjz
zI#PS5X$f`nou<Zmzk+e$W1A5aRGx&g|NV?YUAO@{`c6S4OrSYhy*6<ma0pqZ3U!6z
zBq5{t@@<(MA#4mU9J<Y@(3Zw$RX8d`)y<XqII$Q`lPD1%li~jxEHh$tQt_LaVjw(%
zH;}J8HBI4FvPF-EQ~dbFT3stnK_n5<qE~oV<gtc|yxjTw1iZhofmV3_=6O`Fj0xmf
ziVI@8_bGfe&(vR|ggs;x7$=saG1v>YG}?I@$C)T$3@gG)EwAbsM)0k7Otbn_b31Rr
z5P9c|#jwXQJ&n)+^s-)*fD-!>61D}gvS~`gBhsr&tUfIKo3Pv7$_vpa+SxgwyM+ZA
z!BaB(S6y1xxv<`E)L8k-Rm=-mC|Par+1mDdvV#MgZV<)cO}}-aQmfulyWQ`udYVEi
zo7k}C8j#ZiP-73*DTSl@s9iwXUO*n~*lqgapb3Qapgi=%+EI>YV=sKj;eOXfCk2^V
zapb`Fp&)Fz=c>i)E*1l|hT*Cgfz?E9t1^Cwqeh^>#JNb4M_!ZE8HYNBqOuN@y?O1@
zpxA4xHskR`;<-=DreQZ6(w&7gR3|~3o`9E0k)41K$*20_q})qLTbktAR7%rVvQ!m!
zWciP=X5X=5f#&4dgsM6UR9>K1gPRQ2?O&lFG6%W~R6XL)EDFgKtlu@@**MX%Mc5t>
F{sBZoAK?H1
diff --git a/searx/static/themes/simple/css/searxng.css b/searx/static/themes/simple/css/searxng.css
index 500b556a0..a6c8db39a 100644
--- a/searx/static/themes/simple/css/searxng.css
+++ b/searx/static/themes/simple/css/searxng.css
@@ -802,11 +802,10 @@ template {
--color-toolkit-dialog-background: #fff;
--color-toolkit-tabs-label-border: #fff;
--color-toolkit-tabs-section-border: #ddd;
+ --color-toolkit-select-background: #f7f7f7;
--color-toolkit-select-border: #ddd;
- --color-toolkit-select-border-hover: #bbb;
+ --color-toolkit-select-background-hover: #bbb;
--color-toolkit-input-text-font: #222;
- --color-toolkit-input-text-border: #ddd;
- --color-toolkit-input-text-border-hover: #bbb;
--color-toolkit-checkbox-onoff-background: #ddd;
--color-toolkit-checkbox-onoff-label-background: #3050ff;
--color-toolkit-checkbox-onoff-checked-background: #aaa;
@@ -863,8 +862,8 @@ template {
--color-result-link-font: #8af;
--color-result-link-font-highlight: #8af;
--color-result-link-visited-font: #96b;
- --color-result-publishdate-font: #777;
- --color-result-engines-font: #777;
+ --color-result-publishdate-font: #888;
+ --color-result-engines-font: #888;
--color-result-search-url-border: #555;
--color-result-search-url-font: #fff;
--color-result-detail-font: #fff;
@@ -887,11 +886,10 @@ template {
--color-toolkit-dialog-background: #222;
--color-toolkit-tabs-label-border: #222;
--color-toolkit-tabs-section-border: #555;
+ --color-toolkit-select-background: #3c3b31;
--color-toolkit-select-border: #555;
- --color-toolkit-select-border-hover: #777;
+ --color-toolkit-select-background-hover: #333;
--color-toolkit-input-text-font: #fff;
- --color-toolkit-input-text-border: #555;
- --color-toolkit-input-text-border-hover: #777;
--color-toolkit-checkbox-onoff-background: #3c3b31;
--color-toolkit-checkbox-onoff-label-background: #58f;
--color-toolkit-checkbox-onoff-checked-background: #ddd;
@@ -948,8 +946,8 @@ template {
--color-result-link-font: #8af;
--color-result-link-font-highlight: #8af;
--color-result-link-visited-font: #96b;
- --color-result-publishdate-font: #777;
- --color-result-engines-font: #777;
+ --color-result-publishdate-font: #888;
+ --color-result-engines-font: #888;
--color-result-search-url-border: #555;
--color-result-search-url-font: #fff;
--color-result-detail-font: #fff;
@@ -972,11 +970,10 @@ template {
--color-toolkit-dialog-background: #222;
--color-toolkit-tabs-label-border: #222;
--color-toolkit-tabs-section-border: #555;
+ --color-toolkit-select-background: #3c3b31;
--color-toolkit-select-border: #555;
- --color-toolkit-select-border-hover: #777;
+ --color-toolkit-select-background-hover: #333;
--color-toolkit-input-text-font: #fff;
- --color-toolkit-input-text-border: #555;
- --color-toolkit-input-text-border-hover: #777;
--color-toolkit-checkbox-onoff-background: #3c3b31;
--color-toolkit-checkbox-onoff-label-background: #58f;
--color-toolkit-checkbox-onoff-checked-background: #ddd;
@@ -1653,11 +1650,11 @@ html body .tabs > input:checked + label + section {
}
/* -- select -- */
select {
- height: 28px;
- margin: 0 1em 0 0;
- padding: 2px 8px 2px 0 !important;
+ height: 2.4rem;
+ margin: 0 1rem 0 0;
+ padding: 0.2rem !important;
color: var(--color-search-font);
- font-size: 12px;
+ font-size: 0.9rem;
z-index: 2;
}
select:hover,
@@ -1669,17 +1666,22 @@ select:focus {
appearance: none;
-webkit-appearance: none;
-moz-appearance: none;
- border: none;
- border-bottom: 1px solid var(--color-toolkit-select-border);
+ border-width: 0 2rem 0 0;
+ border-color: transparent;
background: url("data:image/svg+xml;charset=UTF-8,%3C%3Fxml%20version%3D%221.0%22%20encoding%3D%22utf-8%22%3F%3E%0A%3Csvg%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20width%3D%22512%22%20height%3D%22512%22%20viewBox%3D%220%200%20512%20512%22%3E%0A%3Cg%3E%3Cpolygon%20points%3D%22128%2C192%20256%2C320%20384%2C192%22%2F%3E%3C%2Fg%3E%0A%3C%2Fsvg%3E") no-repeat;
- background-position-x: 105%;
- background-size: 2em;
+ background-position-x: calc(100% + 2rem);
+ background-size: 2rem;
background-origin: content-box;
+ background-color: var(--color-toolkit-select-background);
outline: medium none;
+ text-overflow: ellipsis;
+ -webkit-border-radius: 5px;
+ -moz-border-radius: 5px;
+ border-radius: 5px;
}
select:hover,
select:focus {
- border-bottom: 1px solid var(--color-toolkit-select-border-hover);
+ background-color: var(--color-toolkit-select-background-hover);
}
select option {
background-color: var(--color-base-background);
@@ -2203,7 +2205,8 @@ article.result-images .detail {
font-size: 4em;
visibility: hidden;
}
-.index #search {
+.index #search,
+.index #search_header {
margin: 0 auto;
background: inherit;
border: inherit;
@@ -2267,15 +2270,17 @@ article.result-images .detail {
#main_preferences .value input[type="text"] {
width: 13.25rem;
color: var(--color-toolkit-input-text-font);
- border: 1px solid var(--color-toolkit-input-text-border);
- background: none repeat scroll 0 0 var(--color-base-background);
- padding: 0.4rem;
+ border: none;
+ background: none repeat scroll 0 0 var(--color-toolkit-select-background);
+ padding: 0.2rem 0.4rem;
+ height: 2rem;
-webkit-border-radius: 5px;
-moz-border-radius: 5px;
border-radius: 5px;
}
-#main_preferences .value input[type="text"]:hover {
- border: 1px solid var(--color-toolkit-input-text-border-hover);
+#main_preferences .value input[type="text"]:hover,
+#main_preferences .value input[type="text"]:focus {
+ background-color: var(--color-toolkit-select-background-hover);
}
#main_preferences .value select:focus,
#main_preferences .value input:focus {
@@ -2319,6 +2324,19 @@ article.result-images .detail {
#main_preferences table.cookies > tbody > tr:nth-child(even) > td {
background-color: var(--color-settings-tr-hover);
}
+#main_preferences .category {
+ margin-right: 0.5rem;
+}
+#main_preferences .category label {
+ border: 2px solid transparent;
+ padding: 0.2rem 0.4rem;
+ -webkit-border-radius: 5px;
+ -moz-border-radius: 5px;
+ border-radius: 5px;
+}
+#main_preferences .category input[type="checkbox"]:checked + label {
+ border: 2px solid var(--color-categories-item-border-selected);
+}
#main_preferences .name,
#main_preferences .shortcut {
text-align: left;
@@ -2364,6 +2382,10 @@ article.result-images .detail {
* SearXNG, A privacy-respecting, hackable metasearch engine
*/
#search {
+ padding: 0;
+ margin: 0;
+}
+#search_header {
padding: 1.5em 2em 0 7rem;
margin: 0;
background: var(--color-header-background);
@@ -2422,12 +2444,10 @@ article.result-images .detail {
.search_categories {
grid-area: categories;
}
-#search_wrapper {
+.search_box {
+ margin: 0;
padding: 0;
grid-area: search;
-}
-.search_box {
- margin: 0 12px 0 0;
display: inline-flex;
flex-direction: row;
white-space: nowrap;
@@ -2492,18 +2512,30 @@ article.result-images .detail {
background-color: var(--color-search-background-hover);
color: var(--color-search-background);
}
+.no-js #clear_search,
.no-js #send_search {
width: auto !important;
+ border-left: 1px solid var(--color-search-border);
+ padding: 10px;
}
.search_filters {
- display: inline-block;
- margin: 0.8rem 0 0 0;
+ margin: 0.6rem 0 0 10.6rem;
+}
+.search_filters select {
+ background-color: inherit;
+}
+.search_filters select:hover,
+.search_filters select:focus {
+ color: var(--color-base-font);
}
@media screen and (max-width: 80em) {
- #search {
+ #search_header {
padding: 1.5em 0.5rem 0 0.5rem;
column-gap: 0.5rem;
}
+ .search_filters {
+ margin: 0.6rem 0 0 3.5rem;
+ }
#categories {
font-size: 90%;
clear: both;
@@ -2534,10 +2566,10 @@ article.result-images .detail {
}
}
@media screen and (max-width: 50em) {
- #search {
+ #search_header {
width: 100%;
margin: 0;
- padding: 0.1em 0 0 0;
+ padding: 0.1rem 0 0 0;
column-gap: 0;
row-gap: 0;
grid-template-areas: "logo search" "categories categories";
@@ -2545,14 +2577,8 @@ article.result-images .detail {
.search_logo {
padding: 0;
}
- #search_wrapper {
- width: 100%;
- padding: 0;
- }
.search_box {
width: 99%;
- margin: 0.1em;
- padding: 0 0.1em 0 0;
display: flex;
flex-direction: row;
}
@@ -2565,8 +2591,7 @@ article.result-images .detail {
transition: margin-right 0.1s;
}
.search_filters {
- display: block;
- margin: 0.8em 0;
+ margin: 0;
}
.language,
.time_range {
@@ -2586,7 +2611,7 @@ article.result-images .detail {
}
}
@media screen and (max-width: 20rem) {
- #search {
+ #search_header {
grid-template-areas: "search search" "categories categories";
}
#search_logo {
@@ -2744,7 +2769,7 @@ article[data-vim-selected].category-social {
border-left: 0.2rem solid transparent;
}
.result h3 {
- font-size: 1.1em;
+ font-size: 1.2rem;
word-wrap: break-word;
margin: 0.4rem 0 0.4rem 0;
padding: 0;
@@ -2789,13 +2814,35 @@ article[data-vim-selected].category-social {
background: inherit;
font-weight: normal;
}
-.result .url {
- font-size: 0.96em;
- margin: 0 0 3px 0;
- padding: 0;
- max-width: 54em;
- word-wrap: break-word;
+.result .url_wrapper {
+ display: flex;
+ font-size: 1rem;
color: var(--color-result-url-font);
+ flex-wrap: nowrap;
+ overflow: hidden;
+ flex-direction: row;
+ margin: 0;
+ padding: 0;
+}
+.result .url_wrapper .url_o1 {
+ white-space: nowrap;
+ flex-shrink: 1;
+}
+.result .url_wrapper .url_o1::after {
+ content: " ";
+ width: 1ch;
+ display: inline-block;
+}
+.result .url_wrapper .url_o2 {
+ overflow: hidden;
+ white-space: nowrap;
+ flex-basis: content;
+ flex-grow: 0;
+ flex-shrink: 1;
+ text-align: right;
+}
+.result .url_wrapper .url_o2 .url_i2 {
+ float: right;
}
.result .published_date {
font-size: 0.8em;
@@ -2803,16 +2850,14 @@ article[data-vim-selected].category-social {
}
.result img.thumbnail {
float: left;
- padding: 0 5px 10px 0;
- width: 20em;
- min-width: 20em;
- min-height: 8em;
+ padding: 0.6rem 1rem 0 0;
+ width: 20rem;
}
.result img.image {
float: left;
- padding: 0 5px 10px 0;
- width: 100px;
- max-height: 100px;
+ padding: 0.6rem 1rem 0 0;
+ width: 7rem;
+ max-height: 7rem;
object-fit: scale-down;
object-position: right top;
}
@@ -2910,7 +2955,7 @@ article[data-vim-selected].category-social {
display: none !important;
}
#results {
- margin: 2rem 2rem 0 10rem;
+ margin: 1rem 2rem 0 10rem;
display: grid;
grid-template-columns: 45rem 25rem;
grid-template-rows: min-content min-content 1fr min-content;
@@ -3174,7 +3219,7 @@ article[data-vim-selected].category-social {
margin: 2rem 0 0 0 !important;
}
#main_results div#results {
- margin: 2rem auto 0 auto;
+ margin: 1rem auto 0 auto;
justify-content: center;
display: grid;
grid-template-columns: 45rem;
@@ -3184,7 +3229,7 @@ article[data-vim-selected].category-social {
}
}
#main_results div#results.only_template_images {
- margin: 2rem 0.5rem 0 0.5rem;
+ margin: 1rem 0.5rem 0 0.5rem;
display: grid;
grid-template-columns: 100%;
grid-template-rows: min-content min-content 1fr min-content min-content;
diff --git a/searx/static/themes/simple/css/searxng.min.css b/searx/static/themes/simple/css/searxng.min.css
index dc324341174ee5de9a39342f6163fcacde8d3e4d..6a84f28ef2ea257417465204cab35d170f9d0184 100644
GIT binary patch
delta 1549
zcmb_cU1%It6lQ-+Qj*kdo2=<(Tc;D(?xs7_neDE|J0KPW3;uvlO)D5@XYTG?JDr){
zneA@fru9Wc@TDFQB!!3&ZEI-~Mt!JxNRU#+7Xwm#(I-Jr#Gi*gig$Kq(`2=I^6CDZ
zbG~!F@1AqNxS6=MmRLGJ4u9>=0691cKWEbL!oh(Zs&=YQ?S`epzHAm&$8+$0_Cfzx
zw$`7Rnwo;;iTz2oDsbtU45Y>e{A-8R1We?47JO)UBUmu(v+#F$i~;O|SB{JXAaE=@
z<cs;r{{^%X^XDr(pA*XzpH@z*v`#D}aWXq`5+^B+s_Vq6BeBG8;Me2j2gE0W-Nf|W
zNufz}&tTqxt>ay_sg9|j*``gAM^(#pREjOnKXKyC*dv;1YI#|ba@?U#NI|LI<LZ*v
zFe*{Fd-4EqpY3CErUo~x1qIGr8v*V@8dCN{@W<Bzh|?Lk?R5O^$?acwX<A7aMPli=
z#Z9<arJ6BgV3k$n-+A|wMAEV?3^%SG4)7;8;cwx|g=!d>)D4dn#rTG4MR;zm&{wmy
zhFgTAm-oQSbNk^-CmWz`s$zL=Au+D09<JN;Tsst1pdB!=5}>VL-t&~$b>K|3ip_SY
z9V$63&b3XVbDQ+r`V3)tn@ZXZ)<SWh3jpiSj>7K?y#Mt4@dRW(9o*R?#5*56nH&@&
zajJF;UVLu^e)%v3-@H2F7eBh09M(*x+)U_Egdac74=K^pnz-h{(JPNW-xW-joYrg?
ztVT=^Q#YcF#K)q>;AE+@?{(x{Y+}u8!&+smd><nU<?cxlMZ#}a_QDV5j#vS>Z*#+2
z9vsMZk?#rncV$QXOV=Cm{-{ZyZ}H(6h1}v9_<S)9YmF=nExpwr%>^tj-RXMzZ!GT}
zjF+fCzw&3CpJ`InaWHM`#C1&d9IBbPrPOT86FQA8Q;^n2;q|xsVI@6KDJX$m2!fDh
z2a95##k6MHO=J*V$5!Z|6UyWvwuPwOgp@OSkz%)DdYssxW;bVeu;q5sARZRj$Z5EX
z+DYRYlvt;bJS%P!jgVSnZ`amX&1_;3&+$q)-?C;XU0Q&?8oIb0PO05X<bG9ERhPIZ
zN*B^)e`XU&;l5k6;^CGjs3xg15rPq#mA0W#3dJC$Hq%n|!U%}3o*xT)apPYLsg)!O
s%d7dqe;OZW&C7nomJs~|!P$?m?d*%m{;u16iY?{uCSz=w`TnQmKU<+a*Z=?k
delta 921
zcmcIiUr19?9OimACvL`a{wcTCaYN>$dpn!Xtvje*vZv@N6fM@ByKXnzz1wx=Xi5Y@
zPtocZiBYK#B7~-%D3TCE>p_t6p@Muc!N-W|q39v%-s>_jUwis-e!uVge&>AOdGVZ{
zpP?uF>@aF~TV*9CC`>{=FDRTl8jZqrj|+a;E8vse3~MzGt?rEegYr2LEJjMnKF3KD
ze66;D{L%uStLw=tH%~*mXNzz!7*vIuby16FJ5desNA!ay_&-EvDZ&I?uBK2b8&2{{
zT$DJBd_odogu^L5789j7=TBvk3P4)LwPG?QD;ZwOKzhUmr{7rMZmZegQ-?6#`pw8m
zvLrw{X#=*U{6<#^+_RTaUb577g{t!5KwUV>cXr1W`J5DEdc+F?=Z9>2EiAX&;9!RX
zzMm+AhL)-VkzDI&3zMI>9?`&@Ed~7Aq7790O&j)m;qZg~Q2%7Nk!@0hB-F~)kUz@6
z@nIXR4i-b?w$;SxLFORcv!_5d>SVYy<S2lQ#Chi;O;(4G(4^&lz+iRv2)xpni1aFa
zDkUg6$dA=H``JP_Dra+l&C*>#7}m~IklC>r16&<PR6iUW*abgED$Hz1y_jaF3bEdF
z!rVI(%uN)-(gaJ~59J~loZ1Udr_%PVJA1`gCc*hIt_uU2M$W=UR!wI!8H}`}u6<~F
z6iy9P8rhKAfREE}sT@RBD#<FL&6JO<&weRFxh`4CY`D%IXjXMLUx87h8ZPALFmx}M
z!+72V&#Fo&FAUB1HDVM{hd!*uAKti@A8Tw;VzwL;f*4O^xDYfh)O)w#sn5}WT9zpw
b^#-}Tu%npr6IgUv)$;g#1ErR=m36~!GCEX8
diff --git a/searx/static/themes/simple/css/searxng.min.css.map b/searx/static/themes/simple/css/searxng.min.css.map
index 3abcd34007a223a61874b6ad7ae66ec9818e3ef2..4830b7560f2d3f55c1a50beb67257f8b379b2592 100644
GIT binary patch
delta 1263
zcmah|Jxml)5YF2>6@Q}MA-{$bg@h>2$bkYT%H7*{dwYA!v4_ad88sfV@^h%5!g)4W
zXl&HN35BsRF|jZ-n6)qwLntUrEN$#e?2Q&yHqN}|G!|;}GVjfNGv7Be@BUl1yvmlp
zhiVE^2*LY>6ues}(<ZYBEL;Vp@OJ15kM1s-1<5Z<A-i-wsf!u!Mfj`sPh_EPYDYmA
z!zRT?&6Kwk{_;P>Wp>Q_SXUil4n%tDVdZ2+&A3ivGD0}Kgl3ix62lC1wPsizUdmcG
zPY*eY8WtkQ+lS~rDC8M_9o5X~99hVDonxl5Hhd{#ken#!d=8~e>(~T*cYeiPBx^u+
z3?zXyMd~{TOr94BfrlYU79l&OFlW3Vf5Wt?9IPE~)CxK8^Wj|qt;2<{*@%{C_4Y*X
zXsp9~-0`C#D3BIBI`N7{J@aHUgC?W7k*Z&jesz>edQpzgBYjOzWA%ngYfiWMc!KKV
zsR($VdQP+BM^T@FoD|Lw9OsF5g|_@h^r!|Yd47TPd{U)7V6`PnlD8(XNAgclSsb*-
z&uXb8e9JZjtl1PS$5*!4X=E!6SW8zi*P9WQOdCl;+={Ujtn2St4rb0(!Kzci9B*Ad
z)D~vd9IxWpOVbqGC5bt*$|P}A?f$3~Pg|Ht8d_P4LKy^5N54R+bIMJVpanK1@6@S3
zcw&DL;829!rt=Eg-D{G&u$XMw`}eF4yiR^#E<7+BSO%6%6LzF_K~L&5uH>`Sb@WtQ
zE!sps#H={$hTGO5*5xf(PlBk^?6X*mbQ;J738`<S)>T=G4l*n6utN<Ppg?80WLXeO
zR4y1KjUo-dLCUXMWeC&eS5Zo@U&5jssxit^W%JZGAN@PKLaRLZNj5&aqGtRWgR;n5
zg&C2+tXd<LJR|Hr_~b<E)y<|18-pm9&p<3&x7l|?PplT6+MD2lxee}SC$;%g_!0JL
zrBhz0e=!)iHA>&9A&}`Fg?EDxxH*=^-HK?XF<2P77dYb5sztQ%OWwiZ5iKw^tt)t8
v+Iya>4{8%dSUb0WYoVws9R}<is@=KqXNg$fjUt53H*PLcfUEYf_k8>(Fb8MU
delta 931
zcmaJ<OHUI~6waNg3e;E%j(`R*MnjaV7K<1X!QOjkm`=+;hwv!4APprv>Vwjh0>&5<
z6E~U|Ph1!iQ{v7QdN;&JSd*B@Ptc`AjSJoA#(VE5J`!Eb<jkD&o%4O)IjigF)=RYd
zB@7$kAZ*E}I=DN>2q8F07{Mi|t0`44**S(UGQ!SKJVVJme^~QL`!{6OxT;6(I4{?H
z{7+S^p@cg5TEo6D6o*4Q9XZp2vT0O`Kz)ru#A<?Yt9h+|o6v-eRMsVAi7Hmh6ps)x
zicby8<Pc$FxIniNQz~?%nw$zpW$4NLkG3|$8DbLgvKan*z!D=iit-?Sjsl(OX$qUs
zM%`>p^R43{U0a-l*U=`;Z085sZfIzcm!sb*VCC#nw9E&)4x{i-syT{_!oUj@o>&LN
z9h9(3%qQU{=4b-m9BQm|@-&I3Ou}F#X7JD5y$GJg#x%P}&2;iMbdVQ;L;`y}L~9Z1
zgYeOFT5<rg>{XMH$t=I4B?S)o0_`3w^jdJDyN;*K+gkHwQP+!wc?3@qk^K#q5jePG
z8+$Bb=lzAx3zCqvTi~(1i9EOxZ$wGBAGh0mm};XAMfoXka-3!P{gvmxR_8&a+kp4+
zk!n@!N|t^WOs62auQ@H+LJHnGF_ecxiDPJvyNL$@<nniY4hjl-mM_bNj9z>9NELkT
zs)F_Yy;XuoKNhCigHZ3a)ml=Way}^|=?7dtZ-m5^$p5w}FM%;2y3zb+nNM6%Q^hWn
zy?O0qN^V(qXFPs-;9fwV&Gg8H>24tdABI7no=B+`xib^+Xym58ko8yQma^PUr!{?f
tmiiqcvwUN0e_+RAk<R(2<VK26G2R;JEK&v9<xVY7u^VVJ>!C2-^&R^w88-j`
diff --git a/searx/static/themes/simple/img/favicon.png b/searx/static/themes/simple/img/favicon.png
index 5d5b761d47ef6a2ac4c353e58c484adef3c7ff65..3b961014b92ecd5d15f4abf58222fb5dae85e977 100644
GIT binary patch
literal 11114
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
J%f$_T{0}s=$|V2*
delta 4642
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
YWiD@WXPfRk8UO$Q07*qoM6N<$f`F6wasU7T
diff --git a/searx/static/themes/simple/js/searxng.js b/searx/static/themes/simple/js/searxng.js
index a65165bae..830c21d61 100644
--- a/searx/static/themes/simple/js/searxng.js
+++ b/searx/static/themes/simple/js/searxng.js
@@ -861,6 +861,7 @@ searxng.ready(function() {
return false;
});
+ searxng.on(d.getElementById('safesearch'), 'change', submitIfQuery);
searxng.on(d.getElementById('time_range'), 'change', submitIfQuery);
searxng.on(d.getElementById('language'), 'change', submitIfQuery);
}
diff --git a/searx/static/themes/simple/js/searxng.min.js b/searx/static/themes/simple/js/searxng.min.js
index a739d75e0ab6fb0d78d8bd278167120ba240ee4b..eafe896185ed3db486b425e3f9587b7464b4deb7 100644
GIT binary patch
delta 29
lcmX?dnDNVD#tjdQxQY|gQj1d)i;^=YzcNzW{J`jm9stuX4bA`n
delta 14
WcmexznDNMA#tjdQHVYU((E|WFh6f7(
diff --git a/searx/static/themes/simple/js/searxng.min.js.map b/searx/static/themes/simple/js/searxng.min.js.map
index 040648c1fde8287b35bc2befbeacf294c05910ff..dbf4eea89aadbd8bfaf3c42c77b71ed585074f59 100644
GIT binary patch
delta 27
jcmaFxm9g&|<A${!lj}WfI11dWTy&frD>onZkTn7Tv9$|I
delta 27
jcmeDC#`xeX<A${!lW%+QapbvIx#&1MmT&&(A!`Hxw7v_X