Add more glyphs for opensans font (#1032)

* Add more glyphs for opensans font

* Update .htaccess to support woff2 file format

* Fixed browser support for new font face

* Fixed Origine theme css and .htaccess

* Deleted unneeded fonts

* Added stylefiles for OpenSans font

* Fixed all themes with new font css

* Avoid additional CSS file

* htaccess cache control public

* Font casing bug

* Remove TTF font

Too big, low need https://caniuse.com/#search=woff

* Changelog 1032

https://github.com/FreshRSS/FreshRSS/pull/1032
https://github.com/FreshRSS/FreshRSS/pull/1028

13 files changed, 20 insertions, 44 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9e3b143dd..f5b3b06b4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,7 @@
 * Features
 	* Share with Mastodon [#1521](https://github.com/FreshRSS/FreshRSS/issues/1521)
 * UI
+	* Add more Unicode glyphs in the Open Sans font [#1032](https://github.com/FreshRSS/FreshRSS/pull/1032)
 	* Show URL to add subscriptions from third-party tools [#1247](https://github.com/FreshRSS/FreshRSS/issues/1247)
 	* Improved message when checking for new versions [#1586](https://github.com/FreshRSS/FreshRSS/issues/1586)
 * SimplePie
diff --git a/p/.htaccess b/p/.htaccess
index 4321c82d7..74ba7ed11 100644
--- a/p/.htaccess
+++ b/p/.htaccess
@@ -6,6 +6,11 @@ FileETag	None
 AddDefaultCharset	UTF-8
 
 <IfModule mod_mime.c>
+	AddType application/json .map
+	AddType application/font-woff .woff
+	AddType application/font-woff2 .woff2
+
+	AddCharset	UTF-8	.css
 	AddCharset	UTF-8	.html
 	AddCharset	UTF-8	.js
 </IfModule>
@@ -16,6 +21,8 @@ AddDefaultCharset	UTF-8
 
 <IfModule mod_expires.c>
 	ExpiresActive	on
+	ExpiresByType	application/font-woff	"access plus 1 month"
+	ExpiresByType	application/font-woff2	"access plus 1 month"
 	ExpiresByType	application/javascript	"access plus 1 month"
 	ExpiresByType	application/xhtml+xml	"access plus 1 month"
 	ExpiresByType	image/x-icon	"access plus 1 month"
@@ -27,7 +34,7 @@ AddDefaultCharset	UTF-8
 </IfModule>
 
 <IfModule mod_headers.c>
-	<FilesMatch "\.(css|gif|html|ico|js|png|svg|woff)$">
+	<FilesMatch "\.(css|gif|html|ico|js|png|svg|woff|woff2)$">
 		Header	merge Cache-Control "public"
 	</FilesMatch>
 </IfModule>
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