From 7032f7521c344592dc68f89027c98cdec46d7055 Mon Sep 17 00:00:00 2001 From: Alexandre Flament Date: Fri, 23 Apr 2021 11:01:54 +0200 Subject: [PATCH] [mod] /stats: simple theme implementation --- searx/static/themes/simple/css/searx-rtl.css | 56 ++++++---- .../themes/simple/css/searx-rtl.min.css | Bin 28927 -> 29201 bytes searx/static/themes/simple/css/searx.css | 56 ++++++---- searx/static/themes/simple/css/searx.min.css | Bin 28892 -> 29166 bytes .../static/themes/simple/js/searx.head.min.js | Bin 752 -> 752 bytes searx/static/themes/simple/js/searx.min.js | Bin 24399 -> 24399 bytes .../themes/simple/less/preferences.less | 18 ---- searx/static/themes/simple/less/toolkit.less | 33 ++++++ searx/templates/oscar/stats.html | 18 +--- searx/templates/simple/stats.html | 100 +++++++++++++++--- 10 files changed, 197 insertions(+), 84 deletions(-) diff --git a/searx/static/themes/simple/css/searx-rtl.css b/searx/static/themes/simple/css/searx-rtl.css index 0da2850c5..8823fa8b6 100644 --- a/searx/static/themes/simple/css/searx-rtl.css +++ b/searx/static/themes/simple/css/searx-rtl.css @@ -1,4 +1,4 @@ -/*! searx | 21-04-2021 | */ +/*! searx | 23-04-2021 | */ /* * searx, A privacy-respecting, hackable metasearch engine * @@ -1153,6 +1153,25 @@ select:focus { transform: rotate(360deg); } } +/* -- engine-tooltip -- */ +.engine-tooltip { + display: none; + position: absolute; + padding: 0.5rem 1rem; + margin: 0rem 0 0 2rem; + border: 1px solid #ddd; + box-shadow: 2px 2px 2px 0px rgba(0, 0, 0, 0.1); + background: white; + font-size: 14px; + font-weight: normal; + z-index: 1000000; + text-align: left; +} +th:hover .engine-tooltip, +td:hover .engine-tooltip, +.engine-tooltip:hover { + display: inline-block; +} /* -- stacked bar chart -- */ .stacked-bar-chart { margin: 0; @@ -1216,6 +1235,24 @@ select:focus { padding: 0.4rem 0; width: 1px; } +.stacked-bar-chart-serie1 { + display: flex; + flex-shrink: 0; + flex-grow: 0; + flex-basis: unset; + background: #5bc0de; + box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15); + padding: 0.4rem 0; +} +.stacked-bar-chart-serie2 { + display: flex; + flex-shrink: 0; + flex-grow: 0; + flex-basis: unset; + background: #deb15b; + box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15); + padding: 0.4rem 0; +} /*! Autocomplete.js v2.6.3 | license MIT | (c) 2017, Baptiste Donaux | http://autocomplete-js.com */ .autocomplete { position: absolute; @@ -1494,23 +1531,6 @@ select:focus { #main_preferences div.selectable_url pre { width: 100%; } -#main_preferences .engine-tooltip { - display: none; - position: absolute; - padding: 0.5rem 1rem; - margin: 0rem 0 0 2rem; - border: 1px solid #ddd; - background: white; - font-size: 14px; - font-weight: normal; - z-index: 1000000; - text-align: left; -} -#main_preferences th:hover .engine-tooltip, -#main_preferences td:hover .engine-tooltip, -#main_preferences .engine-tooltip:hover { - display: inline-block; -} @media screen and (max-width: 75em) { .preferences_back { clear: both; diff --git a/searx/static/themes/simple/css/searx-rtl.min.css b/searx/static/themes/simple/css/searx-rtl.min.css index 615b88ec58e2068fa42993b00faf8205f129a98e..68b25fa600ea302e704e29e98aef3f90e6803814 100644 GIT binary patch delta 353 zcmezWka6M@Mm~KlMTO$j#G(p?8U-WciF^kpGcy`YJZHMunDLJOhMJSv-2)~&841@Hrxs5v8B^K!> zXCxMt=z?X8s*?}~X66;AmM9n~=o$h|Ml;b=)4CurB_%U2-Ad1-C^c8XpjIz6FFi9a zRktKRKc^(Kz$zoZEVW3dBn84y083B)A)p$!-yXlY4ErCp%b9-2BjT4bNs-k80-48@>Hh0r%#5*#H0l delta 227 zcmbREgz^7FMm~KlMTO$j#G(p?8U-W6iF^kp{xh9;&S0}K;~o9U&BlV8&lsI#o*Zw! zd9sT|@MK}jnUl9#icIFWVxN59!g2F_%K)ay|E=fpr{(9B=$5Bure~B`nHU&Mmh&~) zeBP##XYwI;p~?J)S(6tU`b`$HFq(YOU05?UFFi9aRktKRKc^(Kz$zoZEVW2SIX5vg zFTS8CH7&I$H7_}}SfM0ka-WfyFcz7~Jw|$)-92lVC6W@8v(t<6OY>56lk;=(i>#E5 PO)M>3oHifw@mB=^49r!2 diff --git a/searx/static/themes/simple/css/searx.css b/searx/static/themes/simple/css/searx.css index 15b9f0853..b8c95e19e 100644 --- a/searx/static/themes/simple/css/searx.css +++ b/searx/static/themes/simple/css/searx.css @@ -1,4 +1,4 @@ -/*! searx | 21-04-2021 | */ +/*! searx | 23-04-2021 | */ /* * searx, A privacy-respecting, hackable metasearch engine * @@ -1153,6 +1153,25 @@ select:focus { transform: rotate(360deg); } } +/* -- engine-tooltip -- */ +.engine-tooltip { + display: none; + position: absolute; + padding: 0.5rem 1rem; + margin: 0rem 0 0 2rem; + border: 1px solid #ddd; + box-shadow: 2px 2px 2px 0px rgba(0, 0, 0, 0.1); + background: white; + font-size: 14px; + font-weight: normal; + z-index: 1000000; + text-align: left; +} +th:hover .engine-tooltip, +td:hover .engine-tooltip, +.engine-tooltip:hover { + display: inline-block; +} /* -- stacked bar chart -- */ .stacked-bar-chart { margin: 0; @@ -1216,6 +1235,24 @@ select:focus { padding: 0.4rem 0; width: 1px; } +.stacked-bar-chart-serie1 { + display: flex; + flex-shrink: 0; + flex-grow: 0; + flex-basis: unset; + background: #5bc0de; + box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15); + padding: 0.4rem 0; +} +.stacked-bar-chart-serie2 { + display: flex; + flex-shrink: 0; + flex-grow: 0; + flex-basis: unset; + background: #deb15b; + box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15); + padding: 0.4rem 0; +} /*! Autocomplete.js v2.6.3 | license MIT | (c) 2017, Baptiste Donaux | http://autocomplete-js.com */ .autocomplete { position: absolute; @@ -1494,23 +1531,6 @@ select:focus { #main_preferences div.selectable_url pre { width: 100%; } -#main_preferences .engine-tooltip { - display: none; - position: absolute; - padding: 0.5rem 1rem; - margin: 0rem 0 0 2rem; - border: 1px solid #ddd; - background: white; - font-size: 14px; - font-weight: normal; - z-index: 1000000; - text-align: left; -} -#main_preferences th:hover .engine-tooltip, -#main_preferences td:hover .engine-tooltip, -#main_preferences .engine-tooltip:hover { - display: inline-block; -} @media screen and (max-width: 75em) { .preferences_back { clear: both; diff --git a/searx/static/themes/simple/css/searx.min.css b/searx/static/themes/simple/css/searx.min.css index 52ad98ecd613176bc1afa0af214c491acfa24589..54e4e73ef7f2649be3ab58d2338a9deb6c2c153f 100644 GIT binary patch delta 353 zcmccfkn!DPMm~KlMTO$j#G(p?8U-WciF^kpGcy`YJZHMunDLJOhMJSv-2)~&841@Hrxs5v8B^K!> zXCxMt=z?X8s*?}~X66;AmM9n~=o$h|Ml;b=)4CurB_%U2-Ad1-C^c8XpjIz6FFi9a zRktKRKc^(Kz$zoZEVW3dBn84y083B)A)p$!-yXlY4ErCp%b9-2BjT4bNs-k80-48@;tv0Yx=>?*IS* delta 227 zcmaF&nDNd-Mm~KlMTO$j#G(p?8U-W6iF^kp{xh9;&S0}K;~o9U&BlV8&lsI#o*Zw! zd9sT|@MK}jnUl9#icIFWVxN59!g2F_%K)ay|E=fpr{(9B=$5Bure~B`nHU&Mmh&~) zeBP##XYwI;p~?J)S(6tU`b`$HFq(YOU05?UFFi9aRktKRKc^(Kz$zoZEVW2SIX5vg zFTS8CH7&I$H7_}}SfM0ka-WfyFcz7~Jw|$)-92lVC6W@8v(t<6OY>56lk;=(i>#E5 PO)M>3oHifw(NP5eKYLY_ diff --git a/searx/static/themes/simple/js/searx.head.min.js b/searx/static/themes/simple/js/searx.head.min.js index 043f255158bd0b065d6dcea8366103ffd02589b5..cc57bdea904d9ecad56e90532fe231c0a618fa75 100644 GIT binary patch delta 12 Tcmeys`hj(VG^6oGnJY{HAQS{` delta 12 Tcmeys`hj(VG^620nJY{HAPNL) diff --git a/searx/static/themes/simple/js/searx.min.js b/searx/static/themes/simple/js/searx.min.js index 8ae15bedee0cf5f6eedcb511b63c04b6c7d81d70..36b8c38702c3b722efa6e77a4b504112c9aebb28 100644 GIT binary patch delta 14 VcmX@VkMaCI#tG7l#v5gf;{h*=1zP|B delta 14 VcmX@VkMaCI#tG7lh8ty!;{h*$1z7+9 diff --git a/searx/static/themes/simple/less/preferences.less b/searx/static/themes/simple/less/preferences.less index 93bdaad27..e1e88b51f 100644 --- a/searx/static/themes/simple/less/preferences.less +++ b/searx/static/themes/simple/less/preferences.less @@ -93,24 +93,6 @@ width: 100%; } } - - - .engine-tooltip { - display: none; - position: absolute; - padding: 0.5rem 1rem; - margin: 0rem 0 0 2rem; - border: 1px solid #ddd; - background: white; - font-size: 14px; - font-weight: normal; - z-index: 1000000; - text-align: left; - } - - th:hover .engine-tooltip, td:hover .engine-tooltip, .engine-tooltip:hover { - display: inline-block; - } } diff --git a/searx/static/themes/simple/less/toolkit.less b/searx/static/themes/simple/less/toolkit.less index b3dba9ea9..3e9274fc8 100644 --- a/searx/static/themes/simple/less/toolkit.less +++ b/searx/static/themes/simple/less/toolkit.less @@ -475,6 +475,25 @@ select { } } +/* -- engine-tooltip -- */ +.engine-tooltip { + display: none; + position: absolute; + padding: 0.5rem 1rem; + margin: 0rem 0 0 2rem; + border: 1px solid #ddd; + box-shadow: 2px 2px 2px 0px rgba(0,0,0,0.1); + background: white; + font-size: 14px; + font-weight: normal; + z-index: 1000000; + text-align: left; +} + +th:hover .engine-tooltip, td:hover .engine-tooltip, .engine-tooltip:hover { + display: inline-block; +} + /* -- stacked bar chart -- */ .stacked-bar-chart { margin: 0; @@ -532,3 +551,17 @@ select { padding: 0.4rem 0; width: 1px; } + +.stacked-bar-chart-serie1 { + .stacked-bar-chart-base(); + background: #5bc0de; + box-shadow: inset 0 -1px 0 rgba(0,0,0,.15); + padding: 0.4rem 0; +} + +.stacked-bar-chart-serie2 { + .stacked-bar-chart-base(); + background: #deb15b; + box-shadow: inset 0 -1px 0 rgba(0,0,0,.15); + padding: 0.4rem 0; +} diff --git a/searx/templates/oscar/stats.html b/searx/templates/oscar/stats.html index 149522226..b83714020 100644 --- a/searx/templates/oscar/stats.html +++ b/searx/templates/oscar/stats.html @@ -1,15 +1,5 @@ {% extends "oscar/base.html" %} -{% block styles %} - -{% endblock %} {% block title %}{{ _('stats') }} - {% endblock %} {%- macro th_sort(column_order, column_name) -%} @@ -45,7 +35,7 @@ {% if engine_stat.score %} {{ engine_stat.score|round(1) }} -