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/base-theme/base.css | 6 ------ p/themes/base-theme/template.css | 10 ++++++++++ 2 files changed, 10 insertions(+), 6 deletions(-) (limited to 'p/themes/base-theme') 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%; } -- cgit v1.2.3