From dfbbc3b4714f3a79553343fe28e10e41db7d0f91 Mon Sep 17 00:00:00 2001 From: Alexandre Flament Date: Fri, 12 Nov 2021 11:38:28 +0100 Subject: [PATCH 1/3] [fix] simple theme: /preferences: add tokens field include changes to display input text field in the preferences --- .../themes/simple/src/less/definitions.less | 6 ++++ .../themes/simple/src/less/preferences.less | 33 ++++++++++++++++--- searx/templates/oscar/preferences.html | 2 +- searx/templates/simple/preferences.html | 7 ++++ 4 files changed, 42 insertions(+), 6 deletions(-) diff --git a/searx/static/themes/simple/src/less/definitions.less b/searx/static/themes/simple/src/less/definitions.less index 157cfeed1..d3e048c12 100644 --- a/searx/static/themes/simple/src/less/definitions.less +++ b/searx/static/themes/simple/src/less/definitions.less @@ -91,6 +91,9 @@ --color-toolkit-tabs-section-border: #ddd; --color-toolkit-select-border: #ddd; --color-toolkit-select-border-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; @@ -191,6 +194,9 @@ --color-toolkit-tabs-section-border: #555; --color-toolkit-select-border: #555; --color-toolkit-select-border-hover: #777; + --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/preferences.less b/searx/static/themes/simple/src/less/preferences.less index e0e3dec4b..29ba5bf9e 100644 --- a/searx/static/themes/simple/src/less/preferences.less +++ b/searx/static/themes/simple/src/less/preferences.less @@ -27,6 +27,34 @@ padding: 0; float: left; width: 15em; + + select, + input[type="text"] { + font-size: inherit !important; + margin: 0 1rem 0 0; + } + + select { + width: 14rem; + } + + 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; + + &:hover { + border: 1px solid var(--color-toolkit-input-text-border-hover); + } + } + + select:focus, + input:focus { + outline: none; + box-shadow: 0 0 1px 1px var(--color-btn-background); + } } .description { @@ -38,11 +66,6 @@ font-size: 90%; } - select { - width: 200px; - font-size: inherit !important; - } - table { border-collapse: collapse; } diff --git a/searx/templates/oscar/preferences.html b/searx/templates/oscar/preferences.html index 944a390ef..5c187140f 100644 --- a/searx/templates/oscar/preferences.html +++ b/searx/templates/oscar/preferences.html @@ -183,7 +183,7 @@ {% set label = _('Engine tokens') %} {% set info = _('Access tokens for private engines') %} {{ preferences_item_header(info, label, rtl, 'tokens') }} - + {{ preferences_item_footer(info, label, rtl) }} diff --git a/searx/templates/simple/preferences.html b/searx/templates/simple/preferences.html index 267dd6e14..ec3bd8ed2 100644 --- a/searx/templates/simple/preferences.html +++ b/searx/templates/simple/preferences.html @@ -169,6 +169,13 @@
{% endif %} +
+ {{ _('Engine tokens') }} +

+ +

+

{{ _('Access tokens for private engines') }}

+
{{ tab_footer() }} {{ tab_header('maintab', 'ui', _('User interface')) }} From c79bba60a929ebb013c01d35cfdc4b994d6d3506 Mon Sep 17 00:00:00 2001 From: MrPaulBlack Date: Sat, 13 Nov 2021 16:20:32 +0100 Subject: [PATCH 2/3] [theme] add border radius to engine token input --- searx/static/themes/simple/src/less/preferences.less | 1 + 1 file changed, 1 insertion(+) diff --git a/searx/static/themes/simple/src/less/preferences.less b/searx/static/themes/simple/src/less/preferences.less index 29ba5bf9e..db6831341 100644 --- a/searx/static/themes/simple/src/less/preferences.less +++ b/searx/static/themes/simple/src/less/preferences.less @@ -44,6 +44,7 @@ border: 1px solid var(--color-toolkit-input-text-border); background: none repeat scroll 0 0 var(--color-base-background); padding: 0.4rem; + .rounded-corners-tiny; &:hover { border: 1px solid var(--color-toolkit-input-text-border-hover); From 5721617de4c66e86d7a3e27656b6367f67e97155 Mon Sep 17 00:00:00 2001 From: Markus Heiser Date: Sat, 13 Nov 2021 17:13:09 +0100 Subject: [PATCH 3/3] [build] /static --- .../themes/oscar/css/logicodev.min.css.map | Bin 10142 -> 10142 bytes .../static/themes/simple/css/searxng-rtl.css | 36 ++++++++++++++++-- .../themes/simple/css/searxng-rtl.min.css | Bin 52330 -> 53217 bytes .../themes/simple/css/searxng-rtl.min.css.map | Bin 22989 -> 23308 bytes searx/static/themes/simple/css/searxng.css | 36 ++++++++++++++++-- .../static/themes/simple/css/searxng.min.css | Bin 52291 -> 53178 bytes .../themes/simple/css/searxng.min.css.map | Bin 22933 -> 23252 bytes 7 files changed, 64 insertions(+), 8 deletions(-) diff --git a/searx/static/themes/oscar/css/logicodev.min.css.map b/searx/static/themes/oscar/css/logicodev.min.css.map index 7cec798b3c10167c692f462d51e84016a365750a..52840b8ad15eb62d21541dd672c80de04cba5e78 100644 GIT binary patch delta 57 zcmbQ|KhJ+c<>Uq?v5noSj1wz`CVMjqPyWEzws}6&A}L1a%}%mc7=e_y{9P8tl+9n2 NYnT~RCl{&f004Df6n_8! delta 66 zcmV-I0KNa7Po7VZd6V=35|Kj_k;Wvk#x4Pq83KlpZy=HZ1e3r41+$+5q8b5IvqBxz Y0RdIB7a!dO0YkI(BYXn^Lz8kREJ<}2U;qFB diff --git a/searx/static/themes/simple/css/searxng-rtl.css b/searx/static/themes/simple/css/searxng-rtl.css index d5c78a6ac..1e4f85e6a 100644 --- a/searx/static/themes/simple/css/searxng-rtl.css +++ b/searx/static/themes/simple/css/searxng-rtl.css @@ -804,6 +804,9 @@ template { --color-toolkit-tabs-section-border: #ddd; --color-toolkit-select-border: #ddd; --color-toolkit-select-border-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; @@ -886,6 +889,9 @@ template { --color-toolkit-tabs-section-border: #555; --color-toolkit-select-border: #555; --color-toolkit-select-border-hover: #777; + --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; @@ -2162,6 +2168,32 @@ article.result-images .detail { float: left; width: 15em; } +#main_preferences .value select, +#main_preferences .value input[type="text"] { + font-size: inherit !important; + margin: 0 1rem 0 0; +} +#main_preferences .value select { + width: 14rem; +} +#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; + -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 select:focus, +#main_preferences .value input:focus { + outline: none; + box-shadow: 0 0 1px 1px var(--color-btn-background); +} #main_preferences .description { margin: 0; padding: 5px 0 0 0; @@ -2170,10 +2202,6 @@ article.result-images .detail { color: var(--color-settings-engine-description-font); font-size: 90%; } -#main_preferences select { - width: 200px; - font-size: inherit !important; -} #main_preferences table { border-collapse: collapse; } diff --git a/searx/static/themes/simple/css/searxng-rtl.min.css b/searx/static/themes/simple/css/searxng-rtl.min.css index ba10451b4abd38c5f145dc4956f52fac12bbe4c7..2d041ee91d1c61726c8b5476799ce8c1d93ebdbb 100644 GIT binary patch delta 500 zcmaDggZbfn<_!m=^)vGdN=tN0QY%Vy)AI95tdxz6jI4Ealk;=(i*!r!^K-H@OLP&6 zCO?pp<%DxL&ylX;MsO!jR1%qdK$QbY6AX5bpcIhVN7p0_5w(64+LJA$LwEX1KVsOCdLA?eMs?IMh z$;r%1wKA|y%CFEZ&PYtjF9!w)Fh~k2KzQ<*KAFi*eIk>EyC+PZ(8IdRGlP~s5Y)*}f#3NkX=Y4U0xDHnG)kf5`xjxR{i*U{Y_q}161!Vd=73zYHK zDFg}z==g&ac|ue=W;^MW0!4G2Ci^-l2%0%LI_Ej-1cD{K3Y@$qpAV3=^elAp)=779 zbauwjYv%0eo#g~F*u`0=80auBh-O!io#B%o$_w)WZ7O%tF>!MAG1B1qdobLrN-o6?p%|1Tg!`A zIypMK>i9Z3Isyr2N1ad*E8A)FHES70W>Z(U$@e{FnLW*1CyUzdX43cAe96{I765aC BAMpSH diff --git a/searx/static/themes/simple/css/searxng.css b/searx/static/themes/simple/css/searxng.css index 4f5409b7c..179c81c8e 100644 --- a/searx/static/themes/simple/css/searxng.css +++ b/searx/static/themes/simple/css/searxng.css @@ -804,6 +804,9 @@ template { --color-toolkit-tabs-section-border: #ddd; --color-toolkit-select-border: #ddd; --color-toolkit-select-border-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; @@ -886,6 +889,9 @@ template { --color-toolkit-tabs-section-border: #555; --color-toolkit-select-border: #555; --color-toolkit-select-border-hover: #777; + --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; @@ -2162,6 +2168,32 @@ article.result-images .detail { float: left; width: 15em; } +#main_preferences .value select, +#main_preferences .value input[type="text"] { + font-size: inherit !important; + margin: 0 1rem 0 0; +} +#main_preferences .value select { + width: 14rem; +} +#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; + -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 select:focus, +#main_preferences .value input:focus { + outline: none; + box-shadow: 0 0 1px 1px var(--color-btn-background); +} #main_preferences .description { margin: 0; padding: 5px 0 0 0; @@ -2170,10 +2202,6 @@ article.result-images .detail { color: var(--color-settings-engine-description-font); font-size: 90%; } -#main_preferences select { - width: 200px; - font-size: inherit !important; -} #main_preferences table { border-collapse: collapse; } diff --git a/searx/static/themes/simple/css/searxng.min.css b/searx/static/themes/simple/css/searxng.min.css index 920c0c41bca0ddc84e1a379b5b71414a41f42cea..33037909e71431c73f445004f9d3363cfeec657f 100644 GIT binary patch delta 500 zcmX>+gL&6{<_!m=^)vGdN=tN0QY%Vy)AI95tdxz6jI4Ealk;=(i*!r!^K-H@OLP&6 zCO?pp<%DxL&ylX;MsO!jR1%qdK$QbY6AX5bpcIhVN7p0_5w(64+LJA$LwEX1KVsOCdLA?eMs?IMh z$;r%1wKA|y%CFEZ&PYtjF9!w)Fh~k2KzQ<*KAFi*eIk>EyC+PZ(8IdRGlP~s5Y)SD$ao!lr|&XnP|`Io4uim11a zfwQBFk50O?qpPb!iClIy+o64PZOq?7&O`RqSSOsscvyxzBDsZ1H X7$nE+S?E4_r}b{8GOx{LHuACngHusE delta 95 zcmcbzm2v83#tqy;lcmJCH=7HUGEY7$n#*M9yV*ueRE611M|<*pOO44>tTn|eogAHA xb$lHi9f5?iqfRJ@mF={7r?m_tv#G1wWI+R2W=}KM$v