From cb913a3a76daf357ad36ca39c26b4aaf800211d2 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sun, 21 Feb 2016 19:15:23 +0100
Subject: CSP for statistics and forms

https://github.com/FreshRSS/FreshRSS/issues/1075
---
 p/themes/base-theme/template.css | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'p/themes')

diff --git a/p/themes/base-theme/template.css b/p/themes/base-theme/template.css
index 17a43d3ed..8a12423be 100644
--- a/p/themes/base-theme/template.css
+++ b/p/themes/base-theme/template.css
@@ -110,6 +110,11 @@ td.numeric {
 
 /*=== COMPONENTS */
 /*===============*/
+
+[aria-hidden="true"] {
+	display: none;
+}
+
 /*=== Forms */
 .form-group::after {
 	content: "";
@@ -620,6 +625,9 @@ br + br + br {
 .stat > table {
 	width: 100%;
 }
+.statGraph {
+	height: 300px;
+}
 
 /*=== GLOBAL VIEW */
 /*================*/
-- 
cgit v1.2.3


From 2740dd0401f254d2836a65fed4085a5f0b38c29b Mon Sep 17 00:00:00 2001
From: Wanabo <Wanabo@users.noreply.github.com>
Date: Sun, 6 Mar 2016 11:52:35 +0100
Subject: Added files via upload

Added missing loader.gif
`.loading { background: url("loader.gif") center center no-repeat; font-size: 0; }`
---
 p/themes/base-theme/loader.gif | Bin 0 -> 4167 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 p/themes/base-theme/loader.gif

(limited to 'p/themes')

diff --git a/p/themes/base-theme/loader.gif b/p/themes/base-theme/loader.gif
new file mode 100644
index 000000000..5ff26f0e3
Binary files /dev/null and b/p/themes/base-theme/loader.gif differ
-- 
cgit v1.2.3


From c4ebc5c4a9e403d854b85b4138ffc3f6957689cc Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Tue, 8 Mar 2016 18:20:14 +0100
Subject: CSP for SVG

And moved .htaccess rules in the folder there are used
https://github.com/FreshRSS/FreshRSS/issues/1114
---
 p/.htaccess         | 13 +------------
 p/themes/.htaccess  | 21 +++++++++++++++++++++
 p/themes/index.html | 13 +++++++++++++
 3 files changed, 35 insertions(+), 12 deletions(-)
 create mode 100644 p/themes/.htaccess
 create mode 100644 p/themes/index.html

(limited to 'p/themes')

diff --git a/p/.htaccess b/p/.htaccess
index 2b1e27a88..4321c82d7 100644
--- a/p/.htaccess
+++ b/p/.htaccess
@@ -6,13 +6,8 @@ FileETag	None
 AddDefaultCharset	UTF-8
 
 <IfModule mod_mime.c>
-	AddType application/json .map
-	AddType application/font-woff .woff
-
-	AddCharset	UTF-8	.css
 	AddCharset	UTF-8	.html
 	AddCharset	UTF-8	.js
-	AddCharset	UTF-8	.svg
 </IfModule>
 
 <IfModule mod_deflate.c>
@@ -21,15 +16,9 @@ AddDefaultCharset	UTF-8
 
 <IfModule mod_expires.c>
 	ExpiresActive	on
-	ExpiresByType	application/font-woff	"access plus 1 month"
 	ExpiresByType	application/javascript	"access plus 1 month"
-	ExpiresByType	application/json	"access plus 1 month"
 	ExpiresByType	application/xhtml+xml	"access plus 1 month"
-	ExpiresByType	image/gif	"access plus 1 month"
-	ExpiresByType	image/png	"access plus 1 month"
-	ExpiresByType	image/svg+xml	"access plus 1 month"
 	ExpiresByType	image/x-icon	"access plus 1 month"
-	ExpiresByType	text/css	"access plus 1 month"
 	ExpiresByType	text/html	"access plus 1 month"
 	ExpiresByType	text/javascript	"access plus 1 month"
 	<FilesMatch "\.php$">
@@ -38,7 +27,7 @@ AddDefaultCharset	UTF-8
 </IfModule>
 
 <IfModule mod_headers.c>
-	<FilesMatch "\.(css|html|js|ico|gif|png|woff)$">
+	<FilesMatch "\.(css|gif|html|ico|js|png|svg|woff)$">
 		Header	merge Cache-Control "public"
 	</FilesMatch>
 </IfModule>
diff --git a/p/themes/.htaccess b/p/themes/.htaccess
new file mode 100644
index 000000000..bde718537
--- /dev/null
+++ b/p/themes/.htaccess
@@ -0,0 +1,21 @@
+<IfModule mod_mime.c>
+	AddType application/font-woff .woff
+
+	AddCharset	UTF-8	.css
+	AddCharset	UTF-8	.svg
+</IfModule>
+
+<IfModule mod_expires.c>
+	ExpiresActive	on
+	ExpiresByType	application/font-woff	"access plus 1 month"
+	ExpiresByType	image/gif	"access plus 1 month"
+	ExpiresByType	image/png	"access plus 1 month"
+	ExpiresByType	image/svg+xml	"access plus 1 month"
+	ExpiresByType	text/css	"access plus 1 month"
+</IfModule>
+
+<IfModule mod_headers.c>
+	<FilesMatch "\.svg$">
+		Header	set Content-Security-Policy "default-src 'self'; style-src 'self' 'unsafe-inline'"
+	</FilesMatch>
+</IfModule>
diff --git a/p/themes/index.html b/p/themes/index.html
new file mode 100644
index 000000000..85faaa37e
--- /dev/null
+++ b/p/themes/index.html
@@ -0,0 +1,13 @@
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-GB" lang="en-GB">
+<head>
+<meta charset="UTF-8" />
+<meta http-equiv="Refresh" content="0; url=/" />
+<title>Redirection</title>
+<meta name="robots" content="noindex" />
+</head>
+
+<body>
+<p><a href="/">Redirection</a></p>
+</body>
+</html>
-- 
cgit v1.2.3