From ac73ba3accd8f5638b330002d002460067c4e012 Mon Sep 17 00:00:00 2001 From: Pavel Pletenev Date: Sat, 2 Dec 2017 21:01:29 +0300 Subject: 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 --- p/themes/BlueLagoon/BlueLagoon.css | 6 ------ p/themes/Dark/dark.css | 6 ------ p/themes/Flat/flat.css | 6 ------ p/themes/Origine/origine.css | 6 ------ p/themes/Pafat/pafat.css | 8 +------- p/themes/Screwdriver/screwdriver.css | 6 ------ p/themes/base-theme/base.css | 6 ------ p/themes/base-theme/template.css | 10 ++++++++++ p/themes/fonts/OpenSans.woff | Bin 0 -> 67528 bytes p/themes/fonts/OpenSans.woff2 | Bin 0 -> 61980 bytes p/themes/fonts/openSans.woff | Bin 21956 -> 0 bytes 11 files changed, 11 insertions(+), 43 deletions(-) create mode 100644 p/themes/fonts/OpenSans.woff create mode 100644 p/themes/fonts/OpenSans.woff2 delete mode 100644 p/themes/fonts/openSans.woff (limited to 'p/themes') 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 Binary files /dev/null and b/p/themes/fonts/OpenSans.woff differ diff --git a/p/themes/fonts/OpenSans.woff2 b/p/themes/fonts/OpenSans.woff2 new file mode 100644 index 000000000..0964c7c46 Binary files /dev/null and b/p/themes/fonts/OpenSans.woff2 differ diff --git a/p/themes/fonts/openSans.woff b/p/themes/fonts/openSans.woff deleted file mode 100644 index 55b25f867..000000000 Binary files a/p/themes/fonts/openSans.woff and /dev/null differ -- cgit v1.2.3