Merge pull request #1720 from FreshRSS/dev

FreshRSS 1.9.0

11 files changed, 11 insertions, 43 deletions

diff --git a/p/themes/BlueLagoon/BlueLagoon.css b/p/themes/BlueLagoon/BlueLagoon.css
index 150e27908..186258752 100644
--- a/p/themes/BlueLagoon/BlueLagoon.css
+++ b/p/themes/BlueLagoon/BlueLagoon.css
@@ -1,11 +1,5 @@
 @charset "UTF-8";
 
-/*=== FONTS */
-@font-face {
-	font-family: "OpenSans";
-	src: url("../fonts/openSans.woff") format("woff");
-}
-
 /*=== GENERAL */
 /*============*/
 html, body {
diff --git a/p/themes/Dark/dark.css b/p/themes/Dark/dark.css
index d8415ef25..348b00009 100644
--- a/p/themes/Dark/dark.css
+++ b/p/themes/Dark/dark.css
@@ -1,11 +1,5 @@
 @charset "UTF-8";
 
-/*=== FONTS */
-@font-face {
-	font-family: "OpenSans";
-	src: url("../fonts/openSans.woff") format("woff");
-}
-
 /*=== GENERAL */
 /*============*/
 html, body {
diff --git a/p/themes/Flat/flat.css b/p/themes/Flat/flat.css
index 0240fe4b4..62c4808a4 100644
--- a/p/themes/Flat/flat.css
+++ b/p/themes/Flat/flat.css
@@ -1,11 +1,5 @@
 @charset "UTF-8";
 
-/*=== FONTS */
-@font-face {
-	font-family: "OpenSans";
-	src: url("../fonts/openSans.woff") format("woff");
-}
-
 /*=== GENERAL */
 /*============*/
 html, body {
diff --git a/p/themes/Origine/origine.css b/p/themes/Origine/origine.css
index becf3f433..4a697e811 100644
--- a/p/themes/Origine/origine.css
+++ b/p/themes/Origine/origine.css
@@ -1,11 +1,5 @@
 @charset "UTF-8";
 
-/*=== FONTS */
-@font-face {
-	font-family: "OpenSans";
-	src: url("../fonts/openSans.woff") format("woff");
-}
-
 /*=== GENERAL */
 /*============*/
 html, body {
diff --git a/p/themes/Pafat/pafat.css b/p/themes/Pafat/pafat.css
index 23bc6671d..1b6ebca29 100644
--- a/p/themes/Pafat/pafat.css
+++ b/p/themes/Pafat/pafat.css
@@ -1,11 +1,5 @@
 @charset "UTF-8";
 
-/*=== FONTS */
-@font-face {
-	font-family: "OpenSans";
-	src: url("../fonts/openSans.woff") format("woff");
-}
-
 /*=== GENERAL */
 /*============*/
 html, body {
@@ -1069,4 +1063,4 @@ a.btn {
 	.notification a.close .icon {
 		display: none;
 	}
-}
\ No newline at end of file
+}
diff --git a/p/themes/Screwdriver/screwdriver.css b/p/themes/Screwdriver/screwdriver.css
index b2c539b13..969695f13 100644
--- a/p/themes/Screwdriver/screwdriver.css
+++ b/p/themes/Screwdriver/screwdriver.css
@@ -1,11 +1,5 @@
 @charset "UTF-8";
 
-/*=== FONTS */
-@font-face {
-	font-family: "OpenSans";
-	src: url("../fonts/openSans.woff") format("woff");
-}
-
 /*=== GENERAL */
 /*============*/
 html, body {
diff --git a/p/themes/base-theme/base.css b/p/themes/base-theme/base.css
index 1bf73d8b3..e265cd7ff 100644
--- a/p/themes/base-theme/base.css
+++ b/p/themes/base-theme/base.css
@@ -1,11 +1,5 @@
 @charset "UTF-8";
 
-/*=== FONTS */
-@font-face {
-	font-family: "OpenSans";
-	src: url("../fonts/openSans.woff") format("woff");
-}
-
 /*=== GENERAL */
 /*============*/
 html, body {
diff --git a/p/themes/base-theme/template.css b/p/themes/base-theme/template.css
index 320ad2d9b..e5e1bca05 100644
--- a/p/themes/base-theme/template.css
+++ b/p/themes/base-theme/template.css
@@ -2,9 +2,19 @@
 
 /*=== GENERAL */
 /*============*/
+@font-face {
+	font-family: 'OpenSans';
+	font-style: normal;
+	font-weight: 400;
+	src: local('Open Sans'), local('OpenSans'),
+		url('../fonts/OpenSans.woff2') format('woff2'),
+		url('../fonts/OpenSans.woff') format('woff');
+}
+
 html, body {
 	margin: 0;
 	padding: 0;
+	font-family: "OpenSans", "Cantarell", "Helvetica", "Arial", sans-serif;
 	font-size: 100%;
 }
 
diff --git a/p/themes/fonts/OpenSans.woff b/p/themes/fonts/OpenSans.woff
new file mode 100644
index 000000000..9a96e3baf
--- /dev/null
+++ b/p/themes/fonts/OpenSans.woff
diff --git a/p/themes/fonts/OpenSans.woff2 b/p/themes/fonts/OpenSans.woff2
new file mode 100644
index 000000000..0964c7c46
--- /dev/null
+++ b/p/themes/fonts/OpenSans.woff2
diff --git a/p/themes/fonts/openSans.woff b/p/themes/fonts/openSans.woff
deleted file mode 100644
index 55b25f867..000000000
--- a/p/themes/fonts/openSans.woff
+++ /dev/null