From 15a3dbf7a0222ed243c25c98262be4eeae10db77 Mon Sep 17 00:00:00 2001 From: Markus Heiser Date: Fri, 8 Sep 2023 12:49:01 +0200 Subject: [PATCH] [fix] preferences - layout of the "special queries" tab Signed-off-by: Markus Heiser --- .../themes/simple/src/less/definitions.less | 4 +- .../themes/simple/src/less/preferences.less | 38 ++++++++----------- .../simple/preferences/answerers.html | 22 ++++++----- .../templates/simple/preferences/engines.html | 8 ++-- 4 files changed, 34 insertions(+), 38 deletions(-) diff --git a/searx/static/themes/simple/src/less/definitions.less b/searx/static/themes/simple/src/less/definitions.less index e5a11ff2b..45d5c878d 100644 --- a/searx/static/themes/simple/src/less/definitions.less +++ b/searx/static/themes/simple/src/less/definitions.less @@ -78,7 +78,7 @@ /// Settings Colors --color-settings-tr-hover: #ebebeb; --color-settings-engine-description-font: #545454; - --color-settings-engine-group-background: #0001; + --color-settings-table-group-background: #0001; /// Detail modal --color-result-detail-font: #fff; --color-result-detail-label-font: lightgray; @@ -198,7 +198,7 @@ /// Settings Colors --color-settings-tr-hover: #2c2c32; --color-settings-engine-description-font: darken(#dcdcdc, 30%); - --color-settings-engine-group-background: #1b1b21; + --color-settings-table-group-background: #1b1b21; /// Toolkit Colors --color-toolkit-badge-font: #fff; --color-toolkit-badge-background: #555; diff --git a/searx/static/themes/simple/src/less/preferences.less b/searx/static/themes/simple/src/less/preferences.less index 4f446245a..c22e4af38 100644 --- a/searx/static/themes/simple/src/less/preferences.less +++ b/searx/static/themes/simple/src/less/preferences.less @@ -1,7 +1,18 @@ -#tab-content-query table td, -#tab-content-query table th { - .ltr-text-align-right() !important; - height: 3rem; +table { + border-collapse: collapse; + + th, + td { + text-align: center; + padding: 1rem 0.5rem; + .ltr-text-align-left(); + } + + tr.pref-group th { + font-weight: normal; + .ltr-text-align-left(); + background: var(--color-settings-table-group-background); + } } #main_preferences { @@ -81,14 +92,6 @@ border: 0 none; } - table { - border-collapse: collapse; - } - - table td { - text-align: center; - } - .category { .ltr-margin-right(0.5rem); @@ -104,10 +107,6 @@ } table.table_engines { - td { - height: 3.75rem; - } - th.name { /* stylelint-disable */ label { @@ -130,12 +129,7 @@ } } - .engine-group { - .ltr-text-align-left(); - font-weight: normal; - background: var(--color-settings-engine-group-background); - } - + .checkbox-col, .name, .shortcut { .ltr-text-align-left(); diff --git a/searx/templates/simple/preferences/answerers.html b/searx/templates/simple/preferences/answerers.html index b2770c2f5..98ae61830 100644 --- a/searx/templates/simple/preferences/answerers.html +++ b/searx/templates/simple/preferences/answerers.html @@ -8,14 +8,15 @@ {{ _('Examples') }}{{- '' -}} {{- '' -}} - {{- '' -}} - - {{- _("This is the list of SearXNG's instant answering modules.") -}} - + {{- '' -}} + + {{- _("This is the list of SearXNG's instant answering modules.") -}} + {{- '' -}} + {%- for answerer in answerers -%} {{- '' -}} - {{- '' -}} + {{- '' -}} {{ answerer.keywords|join(', ') }}{{- '' -}} {{ answerer.info.name }}{{- '' -}} {{ answerer.info.description }}{{- '' -}} @@ -23,15 +24,16 @@ {%- endfor -%} - {{- '' -}} - - {{- _('This is the list of plugins.') -}} - {{- '' -}} + {{- '' -}} + + {{- _('This is the list of plugins.') -}} + {{- '' -}} + {%- for plugin in plugins -%} {%- if plugin.preference_section == 'query' -%} {{- '' -}} - {{- checkbox_onoff_reversed('plugin_' + plugin.id, plugin.id not in allowed_plugins) -}}{{- '' -}} + {{- checkbox_onoff_reversed('plugin_' + plugin.id, plugin.id not in allowed_plugins) -}}{{- '' -}} {{ plugin.query_keywords|join(', ') }}{{- '' -}} {{ _(plugin.name) }}{{- '' -}} {{ _(plugin.description) }}{{- '' -}} diff --git a/searx/templates/simple/preferences/engines.html b/searx/templates/simple/preferences/engines.html index 0dd74a0bb..ae71e1c97 100644 --- a/searx/templates/simple/preferences/engines.html +++ b/searx/templates/simple/preferences/engines.html @@ -14,7 +14,7 @@ {{- '' -}} {{- '' -}} - {{- '' -}} + {{- '' -}} {{- '' -}} {{- '' -}} {{- '' -}} @@ -33,9 +33,9 @@ {%- for group, group_bang, engines in engines_by_category[categ] | group_engines_in_tab -%} {%- if loop.length > 1 -%} - {{- '' -}} - {{- '' -}} - {{- '' -}} + {{- '' -}} + {{- '' -}}
{{- _("Allow") -}}{{- _("Allow") -}}{{- _("Engine name") -}}{{ _("!bang") -}}{{- _("Supports selected language") -}}
{{- _(group) -}} +
{{- _(group) -}} {%- if group_bang -%} {{- group_bang -}} {%- endif -%}