From 70cc196e2d933a9a458ec43bf81d8475a57b26df Mon Sep 17 00:00:00 2001
From: Markus Heiser <markus.heiser@darmarit.de>
Date: Wed, 28 Apr 2021 16:07:21 +0200
Subject: [PATCH] [fix] new_issue.html: drop inline style attributes (CSP
 conformance)

Inline styles are blocked by default with Content Security Policy (CSP).  Move
the inline styles from 'new_issue.html' to::

    searx/static/themes/__common__/less/new_issue.less

Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
---
 .../themes/__common__/less/new_issue.less     | 14 ++++++++++++++
 .../oscar/src/less/logicodev-dark/oscar.less  |  1 +
 .../oscar/src/less/logicodev/oscar.less       | 11 +----------
 .../themes/oscar/src/less/pointhi/oscar.less  | 12 +-----------
 searx/static/themes/simple/less/style.less    |  2 ++
 searx/templates/__common__/new_issue.html     | 19 +------------------
 6 files changed, 20 insertions(+), 39 deletions(-)
 create mode 100644 searx/static/themes/__common__/less/new_issue.less

diff --git a/searx/static/themes/__common__/less/new_issue.less b/searx/static/themes/__common__/less/new_issue.less
new file mode 100644
index 000000000..339d4ce47
--- /dev/null
+++ b/searx/static/themes/__common__/less/new_issue.less
@@ -0,0 +1,14 @@
+.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;
+}
+.github-issue-button:hover {
+  background-color: #2ea043;
+}
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 38a4424ac..44d3154a8 100644
--- a/searx/static/themes/oscar/src/less/logicodev-dark/oscar.less
+++ b/searx/static/themes/oscar/src/less/logicodev-dark/oscar.less
@@ -1,4 +1,5 @@
 @import "../logicodev/variables.less";
+@import "../../../../__common__/less/new_issue.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 da80d1e94..3415af30b 100644
--- a/searx/static/themes/oscar/src/less/logicodev/oscar.less
+++ b/searx/static/themes/oscar/src/less/logicodev/oscar.less
@@ -1,23 +1,14 @@
 @import "variables.less";
+@import "../../../../__common__/less/new_issue.less";
 
 @import "navbar.less";
-
 @import "footer.less";
-
 @import "checkbox.less";
-
 @import "onoff.less";
-
 @import "results.less";
-
 @import "infobox.less";
-
 @import "search.less";
-
 @import "advanced.less";
-
 @import "cursor.less";
-
 @import "code.less";
-
 @import "preferences.less";
diff --git a/searx/static/themes/oscar/src/less/pointhi/oscar.less b/searx/static/themes/oscar/src/less/pointhi/oscar.less
index 6f92a0791..4ac8da564 100644
--- a/searx/static/themes/oscar/src/less/pointhi/oscar.less
+++ b/searx/static/themes/oscar/src/less/pointhi/oscar.less
@@ -1,25 +1,15 @@
 @import "variables.less";
+@import "../../../../__common__/less/new_issue.less";
 
 @import "footer.less";
-
 @import "checkbox.less";
-
 @import "onoff.less";
-
 @import "results.less";
-
 @import "infobox.less";
-
 @import "search.less";
-
 @import "advanced.less";
-
 @import "cursor.less";
-
 @import "code.less";
-
 @import "navbar.less";
-
 @import "code.less";
-
 @import "preferences.less";
diff --git a/searx/static/themes/simple/less/style.less b/searx/static/themes/simple/less/style.less
index 55fb721c9..b82b1cb1f 100644
--- a/searx/static/themes/simple/less/style.less
+++ b/searx/static/themes/simple/less/style.less
@@ -6,6 +6,8 @@
 
 @stacked-bar-chart: rgb(0, 0, 0);
 
+@import "../../__common__/less/new_issue.less";
+
 @import "normalize.less";
 
 @import "definitions.less";
diff --git a/searx/templates/__common__/new_issue.html b/searx/templates/__common__/new_issue.html
index 2a111a527..d983417b0 100644
--- a/searx/templates/__common__/new_issue.html
+++ b/searx/templates/__common__/new_issue.html
@@ -10,7 +10,7 @@
 in order to fetch the latest commit ID:
 ```
 git log -1
-``` 
+```
 If you are using searx-docker then look at the bottom of the SearXNG page
 and check for the version after "Powered by SearXNG"
 
@@ -52,23 +52,6 @@ or manually by executing the searx/webapp.py file? -->
 {{-'\n  '}}* {{ test_name }}: {% for result in results%}`{{ result }}`,{% endfor -%}
 {%- endfor -%}
     </textarea>
-    <style>
-        .github-issue-button { 
-            display: block;
-            padding: 8px 16px;
-            font-family: sans-serif;
-            font-size: 16px;
-            color: white;
-            background-color: rgb(35, 134, 54);
-            border: rgb(46, 160, 67);
-            border-radius: 10px !important;
-            box-shadow: rgba(0, 0, 0, 0) 0px 0px 0px 0px;
-        }
-
-        .github-issue-button:hover {
-            background-color: rgb(46, 160, 67);
-        }
-    </style>
     <button type="submit" class="github-issue-button" title="{{ new_issue_url }}">{{ _('Submit a new issue on Github including the above information') }}</button>
 </form>
 {% endmacro %}