diff --git a/.dir-locals.el b/.dir-locals.el index 970199b42..6daf66591 100644 --- a/.dir-locals.el +++ b/.dir-locals.el @@ -49,6 +49,10 @@ ((nil . ((fill-column . 80) + (indent-tabs-mode . nil) + )) + (makefile-gmake-mode + . ((indent-tabs-mode . t) )) (python-mode . ((indent-tabs-mode . nil) diff --git a/searx/static/themes/__common__/less/new_issue.less b/searx/static/themes/__common__/less/new_issue.less index 339d4ce47..175bd3cec 100644 --- a/searx/static/themes/__common__/less/new_issue.less +++ b/searx/static/themes/__common__/less/new_issue.less @@ -1,14 +1,19 @@ .github-issue-button { - display: block; - padding: 8px 16px; - font-family: sans-serif; - font-size: 16px; - color: white; - background-color: #238636 !important; /* important is needed cause to an !important in logicodev-dark */ - border: #2ea043; - border-radius: 10px !important; - box-shadow: rgba(0, 0, 0, 0) 0px 0px 0px 0px; + display: block; + padding: 8px 16px; + font-family: sans-serif; + font-size: 16px; + color: white; + background-color: #238636 !important; /* important is needed cause to an !important in logicodev-dark */ + border: #2ea043; + border-radius: 10px !important; + box-shadow: rgba(0, 0, 0, 0) 0px 0px 0px 0px; } + .github-issue-button:hover { - background-color: #2ea043; + background-color: #2ea043; +} + +.issue-hide { + display: none; } diff --git a/searx/static/themes/__common__/less/stats.less b/searx/static/themes/__common__/less/stats.less new file mode 100644 index 000000000..687d15906 --- /dev/null +++ b/searx/static/themes/__common__/less/stats.less @@ -0,0 +1,83 @@ +.engine-stats { + + .engine-name { + width: 20rem; + } + + .engine-score { + width: 7rem; + text-align: right; + } + + .result-count { + } + + .response-time { + } + + .engine-reliability { + text-align: right; + } + + table.engine-error { + max-width: 1280px; + margin: 1rem; + border: 1px solid gray; + } + + table.engine-error th.engine-error-type, + table.engine-error td.engine-error-type, + failed-test { + width: 10rem; + } + + table.engine-error span.log_parameters + { + border-right: 1px solid gray; + padding: 0 1rem 0 0; + margin: 0 0 0 0.5rem; + } +} + +.bar-chart-value { + width: 3em; + display: inline-block; + text-align: right; + padding-right: 0.5rem; +} + +.bar-chart-graph { + width: calc(100% - 5rem); + display: inline-block; +} + +.bar-chart-bar { + border: 3px solid #5bc0de; + margin: 1px 0; +} + +.bar-chart-serie1 { + border: 3px solid #5bc0de; + margin: 1px 0; + float: left; +} + +.bar-chart-serie2 { + border: 3px solid #deb15b; + margin: 1px 0; + float: left; +} + +.bar0{ + width: 0; + border: 0; +} + +.generate-bar(100); + +.generate-bar(@n, @i: 1) when (@i =< @n) { + .bar@{i} { + width: (@i * 100% / @n); + } + .generate-bar(@n, (@i + 1)); +} diff --git a/searx/static/themes/oscar/css/logicodev-dark.css b/searx/static/themes/oscar/css/logicodev-dark.css index 16950614c..c9b390c2c 100644 --- a/searx/static/themes/oscar/css/logicodev-dark.css +++ b/searx/static/themes/oscar/css/logicodev-dark.css @@ -13,6 +13,362 @@ .github-issue-button:hover { background-color: #2ea043; } +.issue-hide { + display: none; +} +.engine-stats .engine-name { + width: 20rem; +} +.engine-stats .engine-score { + width: 7rem; + text-align: right; +} +.engine-stats .engine-reliability { + text-align: right; +} +.engine-stats table.engine-error { + max-width: 1280px; + margin: 1rem; + border: 1px solid gray; +} +.engine-stats table.engine-error th.engine-error-type, +.engine-stats table.engine-error td.engine-error-type, +.engine-stats failed-test { + width: 10rem; +} +.engine-stats table.engine-error span.log_parameters { + border-right: 1px solid gray; + padding: 0 1rem 0 0; + margin: 0 0 0 0.5rem; +} +.bar-chart-value { + width: 3em; + display: inline-block; + text-align: right; + padding-right: 0.5rem; +} +.bar-chart-graph { + width: calc(100% - 5rem); + display: inline-block; +} +.bar-chart-bar { + border: 3px solid #5bc0de; + margin: 1px 0; +} +.bar-chart-serie1 { + border: 3px solid #5bc0de; + margin: 1px 0; + float: left; +} +.bar-chart-serie2 { + border: 3px solid #deb15b; + margin: 1px 0; + float: left; +} +.bar0 { + width: 0; + border: 0; +} +.bar1 { + width: 1%; +} +.bar2 { + width: 2%; +} +.bar3 { + width: 3%; +} +.bar4 { + width: 4%; +} +.bar5 { + width: 5%; +} +.bar6 { + width: 6%; +} +.bar7 { + width: 7%; +} +.bar8 { + width: 8%; +} +.bar9 { + width: 9%; +} +.bar10 { + width: 10%; +} +.bar11 { + width: 11%; +} +.bar12 { + width: 12%; +} +.bar13 { + width: 13%; +} +.bar14 { + width: 14%; +} +.bar15 { + width: 15%; +} +.bar16 { + width: 16%; +} +.bar17 { + width: 17%; +} +.bar18 { + width: 18%; +} +.bar19 { + width: 19%; +} +.bar20 { + width: 20%; +} +.bar21 { + width: 21%; +} +.bar22 { + width: 22%; +} +.bar23 { + width: 23%; +} +.bar24 { + width: 24%; +} +.bar25 { + width: 25%; +} +.bar26 { + width: 26%; +} +.bar27 { + width: 27%; +} +.bar28 { + width: 28%; +} +.bar29 { + width: 29%; +} +.bar30 { + width: 30%; +} +.bar31 { + width: 31%; +} +.bar32 { + width: 32%; +} +.bar33 { + width: 33%; +} +.bar34 { + width: 34%; +} +.bar35 { + width: 35%; +} +.bar36 { + width: 36%; +} +.bar37 { + width: 37%; +} +.bar38 { + width: 38%; +} +.bar39 { + width: 39%; +} +.bar40 { + width: 40%; +} +.bar41 { + width: 41%; +} +.bar42 { + width: 42%; +} +.bar43 { + width: 43%; +} +.bar44 { + width: 44%; +} +.bar45 { + width: 45%; +} +.bar46 { + width: 46%; +} +.bar47 { + width: 47%; +} +.bar48 { + width: 48%; +} +.bar49 { + width: 49%; +} +.bar50 { + width: 50%; +} +.bar51 { + width: 51%; +} +.bar52 { + width: 52%; +} +.bar53 { + width: 53%; +} +.bar54 { + width: 54%; +} +.bar55 { + width: 55%; +} +.bar56 { + width: 56%; +} +.bar57 { + width: 57%; +} +.bar58 { + width: 58%; +} +.bar59 { + width: 59%; +} +.bar60 { + width: 60%; +} +.bar61 { + width: 61%; +} +.bar62 { + width: 62%; +} +.bar63 { + width: 63%; +} +.bar64 { + width: 64%; +} +.bar65 { + width: 65%; +} +.bar66 { + width: 66%; +} +.bar67 { + width: 67%; +} +.bar68 { + width: 68%; +} +.bar69 { + width: 69%; +} +.bar70 { + width: 70%; +} +.bar71 { + width: 71%; +} +.bar72 { + width: 72%; +} +.bar73 { + width: 73%; +} +.bar74 { + width: 74%; +} +.bar75 { + width: 75%; +} +.bar76 { + width: 76%; +} +.bar77 { + width: 77%; +} +.bar78 { + width: 78%; +} +.bar79 { + width: 79%; +} +.bar80 { + width: 80%; +} +.bar81 { + width: 81%; +} +.bar82 { + width: 82%; +} +.bar83 { + width: 83%; +} +.bar84 { + width: 84%; +} +.bar85 { + width: 85%; +} +.bar86 { + width: 86%; +} +.bar87 { + width: 87%; +} +.bar88 { + width: 88%; +} +.bar89 { + width: 89%; +} +.bar90 { + width: 90%; +} +.bar91 { + width: 91%; +} +.bar92 { + width: 92%; +} +.bar93 { + width: 93%; +} +.bar94 { + width: 94%; +} +.bar95 { + width: 95%; +} +.bar96 { + width: 96%; +} +.bar97 { + width: 97%; +} +.bar98 { + width: 98%; +} +.bar99 { + width: 99%; +} +.bar100 { + width: 100%; +} * { border-radius: 0 !important; } @@ -986,24 +1342,6 @@ th:hover .engine-tooltip, 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; -} /*Global*/ body { background: #1d1f21 none !important; diff --git a/searx/static/themes/oscar/css/logicodev-dark.min.css b/searx/static/themes/oscar/css/logicodev-dark.min.css index 2a59e44db..3b3604efa 100644 Binary files a/searx/static/themes/oscar/css/logicodev-dark.min.css and b/searx/static/themes/oscar/css/logicodev-dark.min.css differ 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 f41a7030c..52b6a2538 100644 Binary files a/searx/static/themes/oscar/css/logicodev-dark.min.css.map and b/searx/static/themes/oscar/css/logicodev-dark.min.css.map differ diff --git a/searx/static/themes/oscar/css/logicodev.css b/searx/static/themes/oscar/css/logicodev.css index 595b81fbc..6c653380f 100644 --- a/searx/static/themes/oscar/css/logicodev.css +++ b/searx/static/themes/oscar/css/logicodev.css @@ -13,6 +13,362 @@ .github-issue-button:hover { background-color: #2ea043; } +.issue-hide { + display: none; +} +.engine-stats .engine-name { + width: 20rem; +} +.engine-stats .engine-score { + width: 7rem; + text-align: right; +} +.engine-stats .engine-reliability { + text-align: right; +} +.engine-stats table.engine-error { + max-width: 1280px; + margin: 1rem; + border: 1px solid gray; +} +.engine-stats table.engine-error th.engine-error-type, +.engine-stats table.engine-error td.engine-error-type, +.engine-stats failed-test { + width: 10rem; +} +.engine-stats table.engine-error span.log_parameters { + border-right: 1px solid gray; + padding: 0 1rem 0 0; + margin: 0 0 0 0.5rem; +} +.bar-chart-value { + width: 3em; + display: inline-block; + text-align: right; + padding-right: 0.5rem; +} +.bar-chart-graph { + width: calc(100% - 5rem); + display: inline-block; +} +.bar-chart-bar { + border: 3px solid #5bc0de; + margin: 1px 0; +} +.bar-chart-serie1 { + border: 3px solid #5bc0de; + margin: 1px 0; + float: left; +} +.bar-chart-serie2 { + border: 3px solid #deb15b; + margin: 1px 0; + float: left; +} +.bar0 { + width: 0; + border: 0; +} +.bar1 { + width: 1%; +} +.bar2 { + width: 2%; +} +.bar3 { + width: 3%; +} +.bar4 { + width: 4%; +} +.bar5 { + width: 5%; +} +.bar6 { + width: 6%; +} +.bar7 { + width: 7%; +} +.bar8 { + width: 8%; +} +.bar9 { + width: 9%; +} +.bar10 { + width: 10%; +} +.bar11 { + width: 11%; +} +.bar12 { + width: 12%; +} +.bar13 { + width: 13%; +} +.bar14 { + width: 14%; +} +.bar15 { + width: 15%; +} +.bar16 { + width: 16%; +} +.bar17 { + width: 17%; +} +.bar18 { + width: 18%; +} +.bar19 { + width: 19%; +} +.bar20 { + width: 20%; +} +.bar21 { + width: 21%; +} +.bar22 { + width: 22%; +} +.bar23 { + width: 23%; +} +.bar24 { + width: 24%; +} +.bar25 { + width: 25%; +} +.bar26 { + width: 26%; +} +.bar27 { + width: 27%; +} +.bar28 { + width: 28%; +} +.bar29 { + width: 29%; +} +.bar30 { + width: 30%; +} +.bar31 { + width: 31%; +} +.bar32 { + width: 32%; +} +.bar33 { + width: 33%; +} +.bar34 { + width: 34%; +} +.bar35 { + width: 35%; +} +.bar36 { + width: 36%; +} +.bar37 { + width: 37%; +} +.bar38 { + width: 38%; +} +.bar39 { + width: 39%; +} +.bar40 { + width: 40%; +} +.bar41 { + width: 41%; +} +.bar42 { + width: 42%; +} +.bar43 { + width: 43%; +} +.bar44 { + width: 44%; +} +.bar45 { + width: 45%; +} +.bar46 { + width: 46%; +} +.bar47 { + width: 47%; +} +.bar48 { + width: 48%; +} +.bar49 { + width: 49%; +} +.bar50 { + width: 50%; +} +.bar51 { + width: 51%; +} +.bar52 { + width: 52%; +} +.bar53 { + width: 53%; +} +.bar54 { + width: 54%; +} +.bar55 { + width: 55%; +} +.bar56 { + width: 56%; +} +.bar57 { + width: 57%; +} +.bar58 { + width: 58%; +} +.bar59 { + width: 59%; +} +.bar60 { + width: 60%; +} +.bar61 { + width: 61%; +} +.bar62 { + width: 62%; +} +.bar63 { + width: 63%; +} +.bar64 { + width: 64%; +} +.bar65 { + width: 65%; +} +.bar66 { + width: 66%; +} +.bar67 { + width: 67%; +} +.bar68 { + width: 68%; +} +.bar69 { + width: 69%; +} +.bar70 { + width: 70%; +} +.bar71 { + width: 71%; +} +.bar72 { + width: 72%; +} +.bar73 { + width: 73%; +} +.bar74 { + width: 74%; +} +.bar75 { + width: 75%; +} +.bar76 { + width: 76%; +} +.bar77 { + width: 77%; +} +.bar78 { + width: 78%; +} +.bar79 { + width: 79%; +} +.bar80 { + width: 80%; +} +.bar81 { + width: 81%; +} +.bar82 { + width: 82%; +} +.bar83 { + width: 83%; +} +.bar84 { + width: 84%; +} +.bar85 { + width: 85%; +} +.bar86 { + width: 86%; +} +.bar87 { + width: 87%; +} +.bar88 { + width: 88%; +} +.bar89 { + width: 89%; +} +.bar90 { + width: 90%; +} +.bar91 { + width: 91%; +} +.bar92 { + width: 92%; +} +.bar93 { + width: 93%; +} +.bar94 { + width: 94%; +} +.bar95 { + width: 95%; +} +.bar96 { + width: 96%; +} +.bar97 { + width: 97%; +} +.bar98 { + width: 98%; +} +.bar99 { + width: 99%; +} +.bar100 { + width: 100%; +} .searx-navbar { background: #29314D; height: 2.3rem; @@ -1013,21 +1369,3 @@ th:hover .engine-tooltip, 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; -} diff --git a/searx/static/themes/oscar/css/logicodev.min.css b/searx/static/themes/oscar/css/logicodev.min.css index 2ac815bb7..6f93b507d 100644 Binary files a/searx/static/themes/oscar/css/logicodev.min.css and b/searx/static/themes/oscar/css/logicodev.min.css differ diff --git a/searx/static/themes/oscar/css/logicodev.min.css.map b/searx/static/themes/oscar/css/logicodev.min.css.map index 4d017668b..50a2494e3 100644 Binary files a/searx/static/themes/oscar/css/logicodev.min.css.map and b/searx/static/themes/oscar/css/logicodev.min.css.map differ diff --git a/searx/static/themes/oscar/css/pointhi.css b/searx/static/themes/oscar/css/pointhi.css index 2741b6f8e..2309d4e26 100644 --- a/searx/static/themes/oscar/css/pointhi.css +++ b/searx/static/themes/oscar/css/pointhi.css @@ -13,6 +13,362 @@ .github-issue-button:hover { background-color: #2ea043; } +.issue-hide { + display: none; +} +.engine-stats .engine-name { + width: 20rem; +} +.engine-stats .engine-score { + width: 7rem; + text-align: right; +} +.engine-stats .engine-reliability { + text-align: right; +} +.engine-stats table.engine-error { + max-width: 1280px; + margin: 1rem; + border: 1px solid gray; +} +.engine-stats table.engine-error th.engine-error-type, +.engine-stats table.engine-error td.engine-error-type, +.engine-stats failed-test { + width: 10rem; +} +.engine-stats table.engine-error span.log_parameters { + border-right: 1px solid gray; + padding: 0 1rem 0 0; + margin: 0 0 0 0.5rem; +} +.bar-chart-value { + width: 3em; + display: inline-block; + text-align: right; + padding-right: 0.5rem; +} +.bar-chart-graph { + width: calc(100% - 5rem); + display: inline-block; +} +.bar-chart-bar { + border: 3px solid #5bc0de; + margin: 1px 0; +} +.bar-chart-serie1 { + border: 3px solid #5bc0de; + margin: 1px 0; + float: left; +} +.bar-chart-serie2 { + border: 3px solid #deb15b; + margin: 1px 0; + float: left; +} +.bar0 { + width: 0; + border: 0; +} +.bar1 { + width: 1%; +} +.bar2 { + width: 2%; +} +.bar3 { + width: 3%; +} +.bar4 { + width: 4%; +} +.bar5 { + width: 5%; +} +.bar6 { + width: 6%; +} +.bar7 { + width: 7%; +} +.bar8 { + width: 8%; +} +.bar9 { + width: 9%; +} +.bar10 { + width: 10%; +} +.bar11 { + width: 11%; +} +.bar12 { + width: 12%; +} +.bar13 { + width: 13%; +} +.bar14 { + width: 14%; +} +.bar15 { + width: 15%; +} +.bar16 { + width: 16%; +} +.bar17 { + width: 17%; +} +.bar18 { + width: 18%; +} +.bar19 { + width: 19%; +} +.bar20 { + width: 20%; +} +.bar21 { + width: 21%; +} +.bar22 { + width: 22%; +} +.bar23 { + width: 23%; +} +.bar24 { + width: 24%; +} +.bar25 { + width: 25%; +} +.bar26 { + width: 26%; +} +.bar27 { + width: 27%; +} +.bar28 { + width: 28%; +} +.bar29 { + width: 29%; +} +.bar30 { + width: 30%; +} +.bar31 { + width: 31%; +} +.bar32 { + width: 32%; +} +.bar33 { + width: 33%; +} +.bar34 { + width: 34%; +} +.bar35 { + width: 35%; +} +.bar36 { + width: 36%; +} +.bar37 { + width: 37%; +} +.bar38 { + width: 38%; +} +.bar39 { + width: 39%; +} +.bar40 { + width: 40%; +} +.bar41 { + width: 41%; +} +.bar42 { + width: 42%; +} +.bar43 { + width: 43%; +} +.bar44 { + width: 44%; +} +.bar45 { + width: 45%; +} +.bar46 { + width: 46%; +} +.bar47 { + width: 47%; +} +.bar48 { + width: 48%; +} +.bar49 { + width: 49%; +} +.bar50 { + width: 50%; +} +.bar51 { + width: 51%; +} +.bar52 { + width: 52%; +} +.bar53 { + width: 53%; +} +.bar54 { + width: 54%; +} +.bar55 { + width: 55%; +} +.bar56 { + width: 56%; +} +.bar57 { + width: 57%; +} +.bar58 { + width: 58%; +} +.bar59 { + width: 59%; +} +.bar60 { + width: 60%; +} +.bar61 { + width: 61%; +} +.bar62 { + width: 62%; +} +.bar63 { + width: 63%; +} +.bar64 { + width: 64%; +} +.bar65 { + width: 65%; +} +.bar66 { + width: 66%; +} +.bar67 { + width: 67%; +} +.bar68 { + width: 68%; +} +.bar69 { + width: 69%; +} +.bar70 { + width: 70%; +} +.bar71 { + width: 71%; +} +.bar72 { + width: 72%; +} +.bar73 { + width: 73%; +} +.bar74 { + width: 74%; +} +.bar75 { + width: 75%; +} +.bar76 { + width: 76%; +} +.bar77 { + width: 77%; +} +.bar78 { + width: 78%; +} +.bar79 { + width: 79%; +} +.bar80 { + width: 80%; +} +.bar81 { + width: 81%; +} +.bar82 { + width: 82%; +} +.bar83 { + width: 83%; +} +.bar84 { + width: 84%; +} +.bar85 { + width: 85%; +} +.bar86 { + width: 86%; +} +.bar87 { + width: 87%; +} +.bar88 { + width: 88%; +} +.bar89 { + width: 89%; +} +.bar90 { + width: 90%; +} +.bar91 { + width: 91%; +} +.bar92 { + width: 92%; +} +.bar93 { + width: 93%; +} +.bar94 { + width: 94%; +} +.bar95 { + width: 95%; +} +.bar96 { + width: 96%; +} +.bar97 { + width: 97%; +} +.bar98 { + width: 98%; +} +.bar99 { + width: 99%; +} +.bar100 { + width: 100%; +} html { position: relative; min-height: 100%; @@ -772,21 +1128,3 @@ td:hover .engine-tooltip, 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; -} diff --git a/searx/static/themes/oscar/css/pointhi.min.css b/searx/static/themes/oscar/css/pointhi.min.css index 2d625c984..e7bfa2528 100644 Binary files a/searx/static/themes/oscar/css/pointhi.min.css and b/searx/static/themes/oscar/css/pointhi.min.css differ diff --git a/searx/static/themes/oscar/css/pointhi.min.css.map b/searx/static/themes/oscar/css/pointhi.min.css.map index e5b7a3be8..7ade17eeb 100644 Binary files a/searx/static/themes/oscar/css/pointhi.min.css.map and b/searx/static/themes/oscar/css/pointhi.min.css.map differ diff --git a/searx/static/themes/oscar/js/searx.min.js b/searx/static/themes/oscar/js/searx.min.js index ad36c8e06..ef828ed60 100644 Binary files a/searx/static/themes/oscar/js/searx.min.js and b/searx/static/themes/oscar/js/searx.min.js differ diff --git a/searx/static/themes/oscar/src/less/logicodev-dark/oscar.less b/searx/static/themes/oscar/src/less/logicodev-dark/oscar.less index 44d3154a8..53ee7ae31 100644 --- a/searx/static/themes/oscar/src/less/logicodev-dark/oscar.less +++ b/searx/static/themes/oscar/src/less/logicodev-dark/oscar.less @@ -1,5 +1,6 @@ @import "../logicodev/variables.less"; @import "../../../../__common__/less/new_issue.less"; +@import "../../../../__common__/less/stats.less"; @stacked-bar-chart: rgb(213, 216, 215, 1); diff --git a/searx/static/themes/oscar/src/less/logicodev/oscar.less b/searx/static/themes/oscar/src/less/logicodev/oscar.less index 3415af30b..57c351bd9 100644 --- a/searx/static/themes/oscar/src/less/logicodev/oscar.less +++ b/searx/static/themes/oscar/src/less/logicodev/oscar.less @@ -1,5 +1,6 @@ @import "variables.less"; @import "../../../../__common__/less/new_issue.less"; +@import "../../../../__common__/less/stats.less"; @import "navbar.less"; @import "footer.less"; diff --git a/searx/static/themes/oscar/src/less/logicodev/preferences.less b/searx/static/themes/oscar/src/less/logicodev/preferences.less index 790ed10b7..32e230413 100644 --- a/searx/static/themes/oscar/src/less/logicodev/preferences.less +++ b/searx/static/themes/oscar/src/less/logicodev/preferences.less @@ -89,17 +89,3 @@ td:hover .engine-tooltip, th:hover .engine-tooltip, .engine-tooltip:hover { 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/static/themes/oscar/src/less/pointhi/oscar.less b/searx/static/themes/oscar/src/less/pointhi/oscar.less index 4ac8da564..689fc1471 100644 --- a/searx/static/themes/oscar/src/less/pointhi/oscar.less +++ b/searx/static/themes/oscar/src/less/pointhi/oscar.less @@ -1,5 +1,6 @@ @import "variables.less"; @import "../../../../__common__/less/new_issue.less"; +@import "../../../../__common__/less/stats.less"; @import "footer.less"; @import "checkbox.less"; diff --git a/searx/static/themes/oscar/src/less/pointhi/preferences.less b/searx/static/themes/oscar/src/less/pointhi/preferences.less index 352aed513..25ba100d6 100644 --- a/searx/static/themes/oscar/src/less/pointhi/preferences.less +++ b/searx/static/themes/oscar/src/less/pointhi/preferences.less @@ -77,18 +77,3 @@ th:hover .engine-tooltip, td:hover .engine-tooltip, .engine-tooltip:hover { 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/static/themes/simple/css/searx-rtl.css b/searx/static/themes/simple/css/searx-rtl.css index c291d532a..333e6de56 100644 --- a/searx/static/themes/simple/css/searx-rtl.css +++ b/searx/static/themes/simple/css/searx-rtl.css @@ -1,4 +1,4 @@ -/*! searx | 28-04-2021 | https://github.com/searxng/searxng */ +/*! searx | 17-05-2021 | https://github.com/searxng/searxng */ /* * searx, A privacy-respecting, hackable metasearch engine * @@ -19,6 +19,362 @@ .github-issue-button:hover { background-color: #2ea043; } +.issue-hide { + display: none; +} +.engine-stats .engine-name { + width: 20rem; +} +.engine-stats .engine-score { + width: 7rem; + text-align: right; +} +.engine-stats .engine-reliability { + text-align: right; +} +.engine-stats table.engine-error { + max-width: 1280px; + margin: 1rem; + border: 1px solid gray; +} +.engine-stats table.engine-error th.engine-error-type, +.engine-stats table.engine-error td.engine-error-type, +.engine-stats failed-test { + width: 10rem; +} +.engine-stats table.engine-error span.log_parameters { + border-right: 1px solid gray; + padding: 0 1rem 0 0; + margin: 0 0 0 0.5rem; +} +.bar-chart-value { + width: 3em; + display: inline-block; + text-align: right; + padding-right: 0.5rem; +} +.bar-chart-graph { + width: calc(100% - 5rem); + display: inline-block; +} +.bar-chart-bar { + border: 3px solid #5bc0de; + margin: 1px 0; +} +.bar-chart-serie1 { + border: 3px solid #5bc0de; + margin: 1px 0; + float: left; +} +.bar-chart-serie2 { + border: 3px solid #deb15b; + margin: 1px 0; + float: left; +} +.bar0 { + width: 0; + border: 0; +} +.bar1 { + width: 1%; +} +.bar2 { + width: 2%; +} +.bar3 { + width: 3%; +} +.bar4 { + width: 4%; +} +.bar5 { + width: 5%; +} +.bar6 { + width: 6%; +} +.bar7 { + width: 7%; +} +.bar8 { + width: 8%; +} +.bar9 { + width: 9%; +} +.bar10 { + width: 10%; +} +.bar11 { + width: 11%; +} +.bar12 { + width: 12%; +} +.bar13 { + width: 13%; +} +.bar14 { + width: 14%; +} +.bar15 { + width: 15%; +} +.bar16 { + width: 16%; +} +.bar17 { + width: 17%; +} +.bar18 { + width: 18%; +} +.bar19 { + width: 19%; +} +.bar20 { + width: 20%; +} +.bar21 { + width: 21%; +} +.bar22 { + width: 22%; +} +.bar23 { + width: 23%; +} +.bar24 { + width: 24%; +} +.bar25 { + width: 25%; +} +.bar26 { + width: 26%; +} +.bar27 { + width: 27%; +} +.bar28 { + width: 28%; +} +.bar29 { + width: 29%; +} +.bar30 { + width: 30%; +} +.bar31 { + width: 31%; +} +.bar32 { + width: 32%; +} +.bar33 { + width: 33%; +} +.bar34 { + width: 34%; +} +.bar35 { + width: 35%; +} +.bar36 { + width: 36%; +} +.bar37 { + width: 37%; +} +.bar38 { + width: 38%; +} +.bar39 { + width: 39%; +} +.bar40 { + width: 40%; +} +.bar41 { + width: 41%; +} +.bar42 { + width: 42%; +} +.bar43 { + width: 43%; +} +.bar44 { + width: 44%; +} +.bar45 { + width: 45%; +} +.bar46 { + width: 46%; +} +.bar47 { + width: 47%; +} +.bar48 { + width: 48%; +} +.bar49 { + width: 49%; +} +.bar50 { + width: 50%; +} +.bar51 { + width: 51%; +} +.bar52 { + width: 52%; +} +.bar53 { + width: 53%; +} +.bar54 { + width: 54%; +} +.bar55 { + width: 55%; +} +.bar56 { + width: 56%; +} +.bar57 { + width: 57%; +} +.bar58 { + width: 58%; +} +.bar59 { + width: 59%; +} +.bar60 { + width: 60%; +} +.bar61 { + width: 61%; +} +.bar62 { + width: 62%; +} +.bar63 { + width: 63%; +} +.bar64 { + width: 64%; +} +.bar65 { + width: 65%; +} +.bar66 { + width: 66%; +} +.bar67 { + width: 67%; +} +.bar68 { + width: 68%; +} +.bar69 { + width: 69%; +} +.bar70 { + width: 70%; +} +.bar71 { + width: 71%; +} +.bar72 { + width: 72%; +} +.bar73 { + width: 73%; +} +.bar74 { + width: 74%; +} +.bar75 { + width: 75%; +} +.bar76 { + width: 76%; +} +.bar77 { + width: 77%; +} +.bar78 { + width: 78%; +} +.bar79 { + width: 79%; +} +.bar80 { + width: 80%; +} +.bar81 { + width: 81%; +} +.bar82 { + width: 82%; +} +.bar83 { + width: 83%; +} +.bar84 { + width: 84%; +} +.bar85 { + width: 85%; +} +.bar86 { + width: 86%; +} +.bar87 { + width: 87%; +} +.bar88 { + width: 88%; +} +.bar89 { + width: 89%; +} +.bar90 { + width: 90%; +} +.bar91 { + width: 91%; +} +.bar92 { + width: 92%; +} +.bar93 { + width: 93%; +} +.bar94 { + width: 94%; +} +.bar95 { + width: 95%; +} +.bar96 { + width: 96%; +} +.bar97 { + width: 97%; +} +.bar98 { + width: 98%; +} +.bar99 { + width: 99%; +} +.bar100 { + width: 100%; +} /*! normalize.css v8.0.0 | MIT License | github.com/necolas/normalize.css */ /* Document ========================================================================== */ @@ -1250,24 +1606,6 @@ td:hover .engine-tooltip, 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; @@ -2132,7 +2470,7 @@ article.result-images[data-vim-selected]::before { box-shadow: 0px 0px 5px #CCC; } #sidebar .infobox h2 { - margin: 0 0 .5em 0; + margin: 0 0 0.5em 0; } #sidebar .infobox img { max-width: 100%; diff --git a/searx/static/themes/simple/css/searx-rtl.min.css b/searx/static/themes/simple/css/searx-rtl.min.css index 83d090034..9f3a4f43a 100644 Binary files a/searx/static/themes/simple/css/searx-rtl.min.css and b/searx/static/themes/simple/css/searx-rtl.min.css differ diff --git a/searx/static/themes/simple/css/searx-rtl.min.css.map b/searx/static/themes/simple/css/searx-rtl.min.css.map new file mode 100644 index 000000000..c1204106b Binary files /dev/null and b/searx/static/themes/simple/css/searx-rtl.min.css.map differ diff --git a/searx/static/themes/simple/css/searx.css b/searx/static/themes/simple/css/searx.css index ba5f6f8c1..61000595b 100644 --- a/searx/static/themes/simple/css/searx.css +++ b/searx/static/themes/simple/css/searx.css @@ -1,4 +1,4 @@ -/*! searx | 28-04-2021 | https://github.com/searxng/searxng */ +/*! searx | 17-05-2021 | https://github.com/searxng/searxng */ /* * searx, A privacy-respecting, hackable metasearch engine * @@ -19,6 +19,362 @@ .github-issue-button:hover { background-color: #2ea043; } +.issue-hide { + display: none; +} +.engine-stats .engine-name { + width: 20rem; +} +.engine-stats .engine-score { + width: 7rem; + text-align: right; +} +.engine-stats .engine-reliability { + text-align: right; +} +.engine-stats table.engine-error { + max-width: 1280px; + margin: 1rem; + border: 1px solid gray; +} +.engine-stats table.engine-error th.engine-error-type, +.engine-stats table.engine-error td.engine-error-type, +.engine-stats failed-test { + width: 10rem; +} +.engine-stats table.engine-error span.log_parameters { + border-right: 1px solid gray; + padding: 0 1rem 0 0; + margin: 0 0 0 0.5rem; +} +.bar-chart-value { + width: 3em; + display: inline-block; + text-align: right; + padding-right: 0.5rem; +} +.bar-chart-graph { + width: calc(100% - 5rem); + display: inline-block; +} +.bar-chart-bar { + border: 3px solid #5bc0de; + margin: 1px 0; +} +.bar-chart-serie1 { + border: 3px solid #5bc0de; + margin: 1px 0; + float: left; +} +.bar-chart-serie2 { + border: 3px solid #deb15b; + margin: 1px 0; + float: left; +} +.bar0 { + width: 0; + border: 0; +} +.bar1 { + width: 1%; +} +.bar2 { + width: 2%; +} +.bar3 { + width: 3%; +} +.bar4 { + width: 4%; +} +.bar5 { + width: 5%; +} +.bar6 { + width: 6%; +} +.bar7 { + width: 7%; +} +.bar8 { + width: 8%; +} +.bar9 { + width: 9%; +} +.bar10 { + width: 10%; +} +.bar11 { + width: 11%; +} +.bar12 { + width: 12%; +} +.bar13 { + width: 13%; +} +.bar14 { + width: 14%; +} +.bar15 { + width: 15%; +} +.bar16 { + width: 16%; +} +.bar17 { + width: 17%; +} +.bar18 { + width: 18%; +} +.bar19 { + width: 19%; +} +.bar20 { + width: 20%; +} +.bar21 { + width: 21%; +} +.bar22 { + width: 22%; +} +.bar23 { + width: 23%; +} +.bar24 { + width: 24%; +} +.bar25 { + width: 25%; +} +.bar26 { + width: 26%; +} +.bar27 { + width: 27%; +} +.bar28 { + width: 28%; +} +.bar29 { + width: 29%; +} +.bar30 { + width: 30%; +} +.bar31 { + width: 31%; +} +.bar32 { + width: 32%; +} +.bar33 { + width: 33%; +} +.bar34 { + width: 34%; +} +.bar35 { + width: 35%; +} +.bar36 { + width: 36%; +} +.bar37 { + width: 37%; +} +.bar38 { + width: 38%; +} +.bar39 { + width: 39%; +} +.bar40 { + width: 40%; +} +.bar41 { + width: 41%; +} +.bar42 { + width: 42%; +} +.bar43 { + width: 43%; +} +.bar44 { + width: 44%; +} +.bar45 { + width: 45%; +} +.bar46 { + width: 46%; +} +.bar47 { + width: 47%; +} +.bar48 { + width: 48%; +} +.bar49 { + width: 49%; +} +.bar50 { + width: 50%; +} +.bar51 { + width: 51%; +} +.bar52 { + width: 52%; +} +.bar53 { + width: 53%; +} +.bar54 { + width: 54%; +} +.bar55 { + width: 55%; +} +.bar56 { + width: 56%; +} +.bar57 { + width: 57%; +} +.bar58 { + width: 58%; +} +.bar59 { + width: 59%; +} +.bar60 { + width: 60%; +} +.bar61 { + width: 61%; +} +.bar62 { + width: 62%; +} +.bar63 { + width: 63%; +} +.bar64 { + width: 64%; +} +.bar65 { + width: 65%; +} +.bar66 { + width: 66%; +} +.bar67 { + width: 67%; +} +.bar68 { + width: 68%; +} +.bar69 { + width: 69%; +} +.bar70 { + width: 70%; +} +.bar71 { + width: 71%; +} +.bar72 { + width: 72%; +} +.bar73 { + width: 73%; +} +.bar74 { + width: 74%; +} +.bar75 { + width: 75%; +} +.bar76 { + width: 76%; +} +.bar77 { + width: 77%; +} +.bar78 { + width: 78%; +} +.bar79 { + width: 79%; +} +.bar80 { + width: 80%; +} +.bar81 { + width: 81%; +} +.bar82 { + width: 82%; +} +.bar83 { + width: 83%; +} +.bar84 { + width: 84%; +} +.bar85 { + width: 85%; +} +.bar86 { + width: 86%; +} +.bar87 { + width: 87%; +} +.bar88 { + width: 88%; +} +.bar89 { + width: 89%; +} +.bar90 { + width: 90%; +} +.bar91 { + width: 91%; +} +.bar92 { + width: 92%; +} +.bar93 { + width: 93%; +} +.bar94 { + width: 94%; +} +.bar95 { + width: 95%; +} +.bar96 { + width: 96%; +} +.bar97 { + width: 97%; +} +.bar98 { + width: 98%; +} +.bar99 { + width: 99%; +} +.bar100 { + width: 100%; +} /*! normalize.css v8.0.0 | MIT License | github.com/necolas/normalize.css */ /* Document ========================================================================== */ @@ -1250,24 +1606,6 @@ td:hover .engine-tooltip, 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; @@ -2132,7 +2470,7 @@ article.result-images[data-vim-selected]::before { box-shadow: 0px 0px 5px #CCC; } #sidebar .infobox h2 { - margin: 0 0 .5em 0; + margin: 0 0 0.5em 0; } #sidebar .infobox img { max-width: 100%; diff --git a/searx/static/themes/simple/css/searx.min.css b/searx/static/themes/simple/css/searx.min.css index 12bac0d0c..9e1c01fc4 100644 Binary files a/searx/static/themes/simple/css/searx.min.css and b/searx/static/themes/simple/css/searx.min.css differ diff --git a/searx/static/themes/simple/css/searx.min.css.map b/searx/static/themes/simple/css/searx.min.css.map new file mode 100644 index 000000000..6ae12cdbb Binary files /dev/null and b/searx/static/themes/simple/css/searx.min.css.map differ diff --git a/searx/static/themes/simple/gruntfile.js b/searx/static/themes/simple/gruntfile.js index 0c322f37f..4c14116b2 100644 --- a/searx/static/themes/simple/gruntfile.js +++ b/searx/static/themes/simple/gruntfile.js @@ -68,11 +68,12 @@ module.exports = function(grunt) { options: { paths: ["less"], plugins: [ - new (require('less-plugin-clean-css'))({ - advanced: true, - compatibility: '*' - }) + new (require('less-plugin-clean-css'))() ], + sourceMap: true, + sourceMapURL: (name) => { const s = name.split('/'); return s[s.length - 1] + '.map';}, + outputSourceFiles: false, + sourceMapRootpath: '../', banner: '/*! searx | <%= grunt.template.today("dd-mm-yyyy") %> | <%= process.env.GIT_URL %> */\n' }, files: { diff --git a/searx/static/themes/simple/js/searx.head.min.js b/searx/static/themes/simple/js/searx.head.min.js index cc57bdea9..b79635a1f 100644 Binary files a/searx/static/themes/simple/js/searx.head.min.js and b/searx/static/themes/simple/js/searx.head.min.js differ diff --git a/searx/static/themes/simple/js/searx.min.js b/searx/static/themes/simple/js/searx.min.js index 36b8c3870..3f4d3e07c 100644 Binary files a/searx/static/themes/simple/js/searx.min.js and b/searx/static/themes/simple/js/searx.min.js differ diff --git a/searx/static/themes/simple/less/style.less b/searx/static/themes/simple/less/style.less index b82b1cb1f..3b0506b98 100644 --- a/searx/static/themes/simple/less/style.less +++ b/searx/static/themes/simple/less/style.less @@ -7,6 +7,7 @@ @stacked-bar-chart: rgb(0, 0, 0); @import "../../__common__/less/new_issue.less"; +@import "../../__common__/less/stats.less"; @import "normalize.less"; diff --git a/searx/static/themes/simple/less/toolkit.less b/searx/static/themes/simple/less/toolkit.less index 3e9274fc8..c381af802 100644 --- a/searx/static/themes/simple/less/toolkit.less +++ b/searx/static/themes/simple/less/toolkit.less @@ -551,17 +551,3 @@ th:hover .engine-tooltip, td:hover .engine-tooltip, .engine-tooltip:hover { 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/static/themes/simple/package.json b/searx/static/themes/simple/package.json index 5150e8153..e84489947 100644 --- a/searx/static/themes/simple/package.json +++ b/searx/static/themes/simple/package.json @@ -4,7 +4,7 @@ "grunt-contrib-concat": "~1.0.1", "grunt-contrib-cssmin": "^2.2.1", "grunt-contrib-jshint": "~1.1.0", - "grunt-contrib-less": "^1.4.1", + "grunt-contrib-less": "~3.0.0", "grunt-contrib-uglify": "~3.4.0", "grunt-contrib-watch": "~1.1.0", "grunt-webfont": "^1.7.1", diff --git a/searx/templates/__common__/new_issue.html b/searx/templates/__common__/new_issue.html index d983417b0..1b28804af 100644 --- a/searx/templates/__common__/new_issue.html +++ b/searx/templates/__common__/new_issue.html @@ -3,7 +3,7 @@ -