[epiphany] Remove custom reader mode fonts



commit ac40f6717f535ccfb5af1e24efc5c3833f77c8d5
Author: Jan-Michael Brummer <jan brummer tabos org>
Date:   Sun Feb 2 17:13:17 2020 +0100

    Remove custom reader mode fonts
    
    Fixes: https://gitlab.gnome.org/GNOME/epiphany/issues/1002

 src/resources/epiphany.gresource.xml               |  12 --
 src/resources/fonts/Merriweather-Bold.otf          | Bin 99956 -> 0 bytes
 src/resources/fonts/Merriweather-BoldItalic.otf    | Bin 98024 -> 0 bytes
 src/resources/fonts/Merriweather-Italic.otf        | Bin 96340 -> 0 bytes
 src/resources/fonts/Merriweather-Regular.otf       | Bin 100616 -> 0 bytes
 src/resources/fonts/MerriweatherSans-Bold.ttf      | Bin 62316 -> 0 bytes
 .../fonts/MerriweatherSans-BoldItalic.ttf          | Bin 60352 -> 0 bytes
 src/resources/fonts/MerriweatherSans-Italic.ttf    | Bin 59920 -> 0 bytes
 src/resources/fonts/MerriweatherSans-Regular.ttf   | Bin 60880 -> 0 bytes
 src/resources/fonts/SourceCodePro-Bold.otf         | Bin 148456 -> 0 bytes
 src/resources/fonts/SourceCodePro-BoldIt.otf       | Bin 123112 -> 0 bytes
 src/resources/fonts/SourceCodePro-It.otf           | Bin 122288 -> 0 bytes
 src/resources/fonts/SourceCodePro-Regular.otf      | Bin 145556 -> 0 bytes
 src/resources/reader.css                           | 143 +--------------------
 14 files changed, 4 insertions(+), 151 deletions(-)
---
diff --git a/src/resources/epiphany.gresource.xml b/src/resources/epiphany.gresource.xml
index ed8ec8cd8..129549f01 100644
--- a/src/resources/epiphany.gresource.xml
+++ b/src/resources/epiphany.gresource.xml
@@ -42,18 +42,6 @@
     <file preprocess="xml-stripblanks" compressed="true">gtk/webapp-additional-urls-dialog.ui</file>
     <file compressed="true">Readability.js</file>
     <file compressed="true">reader.css</file>
-    <file compressed="true">fonts/Merriweather-Regular.otf</file>
-    <file compressed="true">fonts/Merriweather-Bold.otf</file>
-    <file compressed="true">fonts/Merriweather-Italic.otf</file>
-    <file compressed="true">fonts/Merriweather-BoldItalic.otf</file>
-    <file compressed="true">fonts/MerriweatherSans-Regular.ttf</file>
-    <file compressed="true">fonts/MerriweatherSans-Bold.ttf</file>
-    <file compressed="true">fonts/MerriweatherSans-Italic.ttf</file>
-    <file compressed="true">fonts/MerriweatherSans-BoldItalic.ttf</file>
-    <file compressed="true">fonts/SourceCodePro-Regular.otf</file>
-    <file compressed="true">fonts/SourceCodePro-Bold.otf</file>
-    <file compressed="true">fonts/SourceCodePro-It.otf</file>
-    <file compressed="true">fonts/SourceCodePro-BoldIt.otf</file>
   </gresource>
   <gresource prefix="/org/gnome/Epiphany/icons">
     <file compressed="true" alias="scalable/actions/ephy-download-symbolic.svg" 
preprocess="xml-stripblanks">ephy-download-symbolic.svg</file>
diff --git a/src/resources/reader.css b/src/resources/reader.css
index 4d19cdb1c..a41c7f26b 100644
--- a/src/resources/reader.css
+++ b/src/resources/reader.css
@@ -37,148 +37,13 @@
  *   https://www.w3.org/TR/css-fonts-3/#font-face-rule
  */
 
-@font-face {
-  font-family: ephy-reader-serif;
-  src: local('Merriweather'),
-       local('Merriweather-Regular'),
-       url('ephy-resource:///org/gnome/epiphany/fonts/Merriweather-Regular.otf') format('opentype');
-  font-weight: normal;
-  font-style: normal;
-  font-display: block;
-}
-
-@font-face {
-  font-family: ephy-reader-serif;
-  src: local('Merriweather Italic'),
-       local('Merriweather-Italic'),
-       local('Merriweather-It'),
-       url('ephy-resource:///org/gnome/epiphany/fonts/Merriweather-Italic.otf') format('opentype');
-  font-weight: normal;
-  font-style: italic;
-  font-display: block;
-}
-
-@font-face {
-  font-family: ephy-reader-serif;
-  src: local('Merriweather Bold'),
-       local('Merriweather-Bold'),
-       local('Merriweather-Bd'),
-       url('ephy-resource:///org/gnome/epiphany/fonts/Merriweather-Bold.otf') format('opentype');
-  font-weight: bold;
-  font-style: normal;
-  font-display: block;
-}
-
-@font-face {
-  font-family: ephy-reader-serif;
-  src: local('Merriweather Bold Italic'),
-       local('Merriweather-BoldItalic'),
-       local('Merriweather-BoldIt'),
-       local('Merriweather-BdItalic'),
-       local('Merriweather-BdIt'),
-       url('ephy-resource:///org/gnome/epiphany/fonts/Merriweather-BoldItalic.otf') format('opentype');
-  font-weight: bold;
-  font-style: italic;
-  font-display: block;
-}
-
-@font-face {
-  font-family: ephy-reader-sans;
-  src: local('Merriweather Sans'),
-       local('MerriweatherSans-Regular'),
-       url('ephy-resource:///org/gnome/epiphany/fonts/MerriweatherSans-Regular.ttf') format('truetype');
-  font-weight: normal;
-  font-style: normal;
-  font-display: block;
-}
-
-@font-face {
-  font-family: ephy-reader-sans;
-  src: local('Merriweather Sans Italic'),
-       local('MerriweatherSans-Italic'),
-       local('MerriweatherSans-It'),
-       url('ephy-resource:///org/gnome/epiphany/fonts/MerriweatherSans-Italic.ttf') format('truetype');
-  font-weight: normal;
-  font-style: italic;
-  font-display: block;
-}
-
-@font-face {
-  font-family: ephy-reader-sans;
-  src: local('Merriweather Sans Bold'),
-       local('MerriweatherSans-Bold'),
-       local('MerriweatherSans-Bd'),
-       url('ephy-resource:///org/gnome/epiphany/fonts/MerriweatherSans-Bold.ttf') format('truetype');
-  font-weight: bold;
-  font-style: normal;
-  font-display: block;
-}
-
-@font-face {
-  font-family: ephy-reader-sans;
-  src: local('Merriweather Sans Bold Italic'),
-       local('MerriweatherSans-BoldItalic'),
-       local('MerriweatherSans-BoldIt'),
-       local('MerriweatherSans-BdItalic'),
-       local('MerriweatherSans-BdIt'),
-       url('ephy-resource:///org/gnome/epiphany/fonts/MerriweatherSans-BoldItalic.ttf') format('truetype');
-  font-weight: bold;
-  font-style: italic;
-  font-display: block;
-}
-
-@font-face {
-  font-family: ephy-reader-mono;
-  src: local('Source Code Pro'),
-       local('SourceCodePro-Regular'),
-       url('ephy-resource:///org/gnome/epiphany/fonts/SourceCodePro-Regular.otf') format('opentype');
-  font-weight: normal;
-  font-style: normal;
-  font-display: block;
-}
-
-@font-face {
-  font-family: ephy-reader-mono;
-  src: local('Source Code Pro Italic'),
-       local('SourceCodePro-Italic'),
-       local('SourceCodePro-It'),
-       url('ephy-resource:///org/gnome/epiphany/fonts/SourceCodePro-It.otf') format('opentype');
-  font-weight: normal;
-  font-style: italic;
-  font-display: block;
-}
-
-@font-face {
-  font-family: ephy-reader-mono;
-  src: local('Source Code Pro Bold'),
-       local('SourceCodePro-Bold'),
-       local('SourceCodePro-Bd'),
-       url('ephy-resource:///org/gnome/epiphany/fonts/SourceCodePro-Regular.otf') format('opentype');
-  font-weight: bold;
-  font-style: normal;
-  font-display: block;
-}
-
-@font-face {
-  font-family: ephy-reader-mono;
-  src: local('Source Code Pro Bold Italic'),
-       local('SourceCodePro-BoldItalic'),
-       local('SourceCodePro-BoldIt'),
-       local('SourceCodePro-BdItalic'),
-       local('SourceCodePro-BdIt'),
-       url('ephy-resource:///org/gnome/epiphany/fonts/SourceCodePro-Regular.otf') format('opentype');
-  font-weight: bold;
-  font-style: italic;
-  font-display: block;
-}
-
 
 body.sans {
-  font-family: ephy-reader-sans, sans-serif;
+  font-family: sans-serif;
 }
 
 body.serif {
-  font-family: ephy-reader-serif, serif;
+  font-family: serif;
 }
 
 body {
@@ -206,7 +71,7 @@ h6 {
   /* Contrast ratio: 4.77 */
   font-weight: bold;
   color: #555555;
-  font-family: ephy-reader-serif, serif;
+  font-family: serif;
 }
 
 body.serif h1,
@@ -215,7 +80,7 @@ body.serif h3,
 body.serif h4,
 body.serif h5,
 body.serif h6 {
-  font-family: ephy-reader-sans, sans-serif;
+  font-family: sans-serif;
 }
 
 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]