kamp/searxng
1
0
Fork 0
mirror of https://github.com/searxng/searxng.git synced 2024-11-05 04:40:11 +01:00
Code

Merge pull request #292 from return42/fix-csp

Browse Source 
[fix] make HTML templates more CSP compliant
This commit is contained in:
Alexandre Flament 2021-09-06 11:45:15 +02:00 committed by GitHub
commit a26e4eff10
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
27 changed files with 60 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
searx/static/themes/__common__/less/result_templates.less Normal file
View File

@ -0,0 +1,5 @@
.osm-map-box {
height:300px;
width:100%;
margin: 10px 0;
}

7
searx/static/themes/oscar/css/logicodev-dark.css
View File

@ -369,9 +369,14 @@
.bar100 {
width: 100%;
}
.osm-map-box {
height: 300px;
width: 100%;
margin: 10px 0;
}
/*
this file is generated automatically by searx_extra/update/update_pygments.py
using pygments version 2.9.0
using pygments version 2.10.0
*/
.code-highlight .linenos {
-webkit-touch-callout: none;

2
searx/static/themes/oscar/css/logicodev-dark.min.css vendored
View File

File diff suppressed because one or more lines are too long

2
searx/static/themes/oscar/css/logicodev-dark.min.css.map
View File

File diff suppressed because one or more lines are too long

7
searx/static/themes/oscar/css/logicodev.css
View File

@ -369,9 +369,14 @@
.bar100 {
width: 100%;
}
.osm-map-box {
height: 300px;
width: 100%;
margin: 10px 0;
}
/*
this file is generated automatically by searx_extra/update/update_pygments.py
using pygments version 2.9.0
using pygments version 2.10.0
*/
.code-highlight .linenos {
-webkit-touch-callout: none;

2
searx/static/themes/oscar/css/logicodev.min.css vendored
View File

File diff suppressed because one or more lines are too long

2
searx/static/themes/oscar/css/logicodev.min.css.map
View File

File diff suppressed because one or more lines are too long

7
searx/static/themes/oscar/css/pointhi.css
View File

@ -369,9 +369,14 @@
.bar100 {
width: 100%;
}
.osm-map-box {
height: 300px;
width: 100%;
margin: 10px 0;
}
/*
this file is generated automatically by searx_extra/update/update_pygments.py
using pygments version 2.9.0
using pygments version 2.10.0
*/
.code-highlight .linenos {
-webkit-touch-callout: none;

2
searx/static/themes/oscar/css/pointhi.min.css vendored
View File

File diff suppressed because one or more lines are too long

2
searx/static/themes/oscar/css/pointhi.min.css.map
View File

File diff suppressed because one or more lines are too long

2
searx/static/themes/oscar/src/generated/pygments-logicodev.less
View File

@ -1,6 +1,6 @@
/*
this file is generated automatically by searx_extra/update/update_pygments.py
using pygments version 2.9.0
using pygments version 2.10.0
*/
.code-highlight .linenos {

2
searx/static/themes/oscar/src/generated/pygments-pointhi.less
View File

@ -1,6 +1,6 @@
/*
this file is generated automatically by searx_extra/update/update_pygments.py
using pygments version 2.9.0
using pygments version 2.10.0
*/
.code-highlight .linenos {

1
searx/static/themes/oscar/src/less/logicodev-dark/oscar.less
View File

@ -1,6 +1,7 @@
@import "../logicodev/variables.less";
@import "../../../../__common__/less/new_issue.less";
@import "../../../../__common__/less/stats.less";
@import "../../../../__common__/less/result_templates.less";
@import "../../generated/pygments-logicodev.less";
@stacked-bar-chart: rgb(213, 216, 215, 1);

1
searx/static/themes/oscar/src/less/logicodev/oscar.less
View File

@ -1,6 +1,7 @@
@import "variables.less";
@import "../../../../__common__/less/new_issue.less";
@import "../../../../__common__/less/stats.less";
@import "../../../../__common__/less/result_templates.less";
@import "../../generated/pygments-logicodev.less";
@import "navbar.less";

1
searx/static/themes/oscar/src/less/pointhi/oscar.less
View File

@ -1,6 +1,7 @@
@import "variables.less";
@import "../../../../__common__/less/new_issue.less";
@import "../../../../__common__/less/stats.less";
@import "../../../../__common__/less/result_templates.less";
@import "../../generated/pygments-pointhi.less";
@import "footer.less";

7
searx/static/themes/simple/css/searx-rtl.css
View File

@ -374,6 +374,11 @@
.bar100 {
width: 100%;
}
.osm-map-box {
height: 300px;
width: 100%;
margin: 10px 0;
}
/*! normalize.css v8.0.1 | MIT License | github.com/necolas/normalize.css */
/* Document
@ -825,7 +830,7 @@ template {
}
/*
this file is generated automatically by searx_extra/update/update_pygments.py
using pygments version 2.9.0
using pygments version 2.10.0
*/
.code-highlight .linenos {
-webkit-touch-callout: none;

2
searx/static/themes/simple/css/searx-rtl.min.css vendored
View File

File diff suppressed because one or more lines are too long

2
searx/static/themes/simple/css/searx-rtl.min.css.map
View File

File diff suppressed because one or more lines are too long

7
searx/static/themes/simple/css/searx.css
View File

@ -374,6 +374,11 @@
.bar100 {
width: 100%;
}
.osm-map-box {
height: 300px;
width: 100%;
margin: 10px 0;
}
/*! normalize.css v8.0.1 | MIT License | github.com/necolas/normalize.css */
/* Document
@ -825,7 +830,7 @@ template {
}
/*
this file is generated automatically by searx_extra/update/update_pygments.py
using pygments version 2.9.0
using pygments version 2.10.0
*/
.code-highlight .linenos {
-webkit-touch-callout: none;

2
searx/static/themes/simple/css/searx.min.css vendored
View File

File diff suppressed because one or more lines are too long

2
searx/static/themes/simple/css/searx.min.css.map
View File

File diff suppressed because one or more lines are too long

2
searx/static/themes/simple/src/generated/pygments.less
View File

@ -1,6 +1,6 @@
/*
this file is generated automatically by searx_extra/update/update_pygments.py
using pygments version 2.9.0
using pygments version 2.10.0
*/
.code-highlight .linenos {

1
searx/static/themes/simple/src/less/style.less
View File

@ -10,6 +10,7 @@
@import "../../__common__/less/new_issue.less";
@import "../../__common__/less/stats.less";
@import "../../__common__/less/result_templates.less";
@import (inline) "../../node_modules/normalize.css/normalize.css";
@import "../generated/ion.less";
@import "definitions.less";

6
searx/templates/oscar/preferences.html
View File

@ -27,9 +27,9 @@
<span class="stacked-bar-chart-value">{{- stats[engine_name].time -}}</span>{{- "" -}}
<span class="stacked-bar-chart" aria-labelledby="{{engine_name}}_chart" aria-hidden="true">
{%- if max_rate95 is not none and max_rate95 > 0 -%}
<span style="width: calc(max(2px, 100%*{{ (stats[engine_name].time / max_rate95)|round(3) }}))" class="stacked-bar-chart-median"></span>{{- "" -}}
<span style="width: calc(100%*{{ ((stats[engine_name].rate80 - stats[engine_name].time) / max_rate95)|round(3) }})" class="stacked-bar-chart-rate80"></span>{{- "" -}}
<span style="width: calc(100%*{{ ((stats[engine_name].rate95 - stats[engine_name].rate80) / max_rate95)|round(3) }})" class="stacked-bar-chart-rate95"></span>{{- "" -}}
<div class="stacked-bar-chart-median bar{{ (100 * (stats[engine_name].time / max_rate95))|round }}"></div>{{- "" -}}
<div class="stacked-bar-chart-rate80 bar{{ (100 * ((stats[engine_name].rate80 - stats[engine_name].time) / max_rate95))|round }}"></div>{{- "" -}}
<div class="stacked-bar-chart-rate95 bar{{ (100 * ((stats[engine_name].rate95 - stats[engine_name].rate80) / max_rate95))|round }}"></div>{{- "" -}}
<span class="stacked-bar-chart-rate100"></span>
{%- endif -%}
</span>{{- "" -}}

2
searx/templates/oscar/result_templates/map.html
View File

@ -64,7 +64,7 @@
{%- if (result.latitude and result.longitude) or result.boundingbox -%}
<div class="collapse" id="result-map-{{ index }}">
<div style="height:300px; width:100%; margin: 10px 0;" id="osm-map-{{ index }}"></div>
<div class="osm-map-box" id="osm-map-{{ index }}"></div>
</div>
{%- endif -%}

6
searx/templates/simple/preferences.html
View File

@ -41,9 +41,9 @@
<span class="stacked-bar-chart-value">{{- stats[engine_name].time -}}</span>{{- "" -}}
<span class="stacked-bar-chart" aria-labelledby="{{engine_name}}_chart" aria-hidden="true">
{%- if max_rate95 is not none and max_rate95 > 0 -%}
<span style="width: calc(max(2px, 100%*{{ (stats[engine_name].time / max_rate95)|round(3) }}))" class="stacked-bar-chart-median"></span>{{- "" -}}
<span style="width: calc(100%*{{ ((stats[engine_name].rate80 - stats[engine_name].time) / max_rate95)|round(3) }})" class="stacked-bar-chart-rate80"></span>{{- "" -}}
<span style="width: calc(100%*{{ ((stats[engine_name].rate95 - stats[engine_name].rate80) / max_rate95)|round(3) }})" class="stacked-bar-chart-rate95"></span>{{- "" -}}
<div class="stacked-bar-chart-median bar{{ (100 * (stats[engine_name].time / max_rate95))|round }}"></div>{{- "" -}}
<div class="stacked-bar-chart-rate80 bar{{ (100 * ((stats[engine_name].rate80 - stats[engine_name].time) / max_rate95))|round }}"></div>{{- "" -}}
<div class="stacked-bar-chart-rate95 bar{{ (100 * ((stats[engine_name].rate95 - stats[engine_name].rate80) / max_rate95))|round }}"></div>{{- "" -}}
<span class="stacked-bar-chart-rate100"></span>
{%- endif -%}
</span>{{- "" -}}

2
searx/templates/simple/result_templates/map.html
View File

@ -45,7 +45,7 @@
{{- result_sub_footer(result, proxify) -}}
{% if (result.latitude and result.longitude) or result.boundingbox -%}
<div id="result-map-{{ index }}" class="invisible"><div id="osm-map-{{ index }}" style="height:300px; width:100%; margin: 10px 0;" ></div></div>
<div id="result-map-{{ index }}" class="invisible"><div id="osm-map-{{ index }}" class="osm-map-box"></div></div>
{%- endif %}
{{- result_footer(result) }}