Merge pull request #795 from omnivore-app/fix/appreader-fonts

apple/OmnivoreKit/Sources/Views/FontSizeAdjustmentPopoverView.swift

@@ -3,14 +3,17 @@ import Utils
 
 public enum WebFont: String, CaseIterable {
   case inter = "Inter"
-  case merriweather = "Merriweather"
-  case lyon = "Lyon"
-  case tisa = "Tisa"
   case system = "unset"
+  case merriweather = "Merriweather"
+  case lora = "Lora"
+  case opensans = "Open Sans"
+  case roboto = "Roboto"
+  case crimsontext = "Crimson Text"
+  case sourceserifpro = "Source Serif Pro"
 
   var displayValue: String {
     switch self {
-    case .inter, .merriweather, .lyon, .tisa:
+    case .inter, .merriweather, .lora, .opensans, .roboto, .crimsontext, .sourceserifpro:
       return rawValue
     case .system:
       return "System Default"

packages/web/styles/globals.css

@@ -81,6 +81,132 @@ div#appleid-signin {
   src: url('/static/fonts/Inter/Inter-Black-900.ttf');
 }
 
+@font-face {
+  font-family: 'Lora';
+  font-weight: 400;
+  font-style: normal;
+  src: url('/static/fonts/Lora/Lora-Regular.ttf');
+}
+
+@font-face {
+  font-family: 'Lora';
+  font-weight: 700;
+  font-style: normal;
+  src: url('/static/fonts/Lora/Lora-Bold.ttf');
+}
+
+@font-face {
+  font-family: 'Lora';
+  font-weight: 400;
+  font-style: italic;
+  src: url('/static/fonts/Lora/Lora-Italic.ttf');
+}
+
+@font-face {
+  font-family: 'Merriweather';
+  font-weight: 400;
+  font-style: normal;
+  src: url('/static/fonts/Merriweather/Merriweather-Regular.ttf');
+}
+
+@font-face {
+  font-family: 'Merriweather';
+  font-weight: 700;
+  font-style: normal;
+  src: url('/static/fonts/Merriweather/Merriweather-Bold.ttf');
+}
+
+@font-face {
+  font-family: 'Merriweather';
+  font-weight: 400;
+  font-style: italic;
+  src: url('/static/fonts/Merriweather/Merriweather-Italic.ttf');
+}
+
+@font-face {
+  font-family: 'Open Sans';
+  font-weight: 400;
+  font-style: normal;
+  src: url('/static/fonts/Open_Sans/OpenSans-Regular.ttf');
+}
+
+@font-face {
+  font-family: 'Open Sans';
+  font-weight: 700;
+  font-style: normal;
+  src: url('/static/fonts/Open_Sans/OpenSans-Bold.ttf');
+}
+
+@font-face {
+  font-family: 'Open Sans';
+  font-weight: 400;
+  font-style: italic;
+  src: url('/static/fonts/Open_Sans/OpenSans-Italic.ttf');
+}
+
+@font-face {
+  font-family: 'Roboto';
+  font-weight: 400;
+  font-style: normal;
+  src: url('/static/fonts/Roboto/Roboto-Regular.ttf');
+}
+
+@font-face {
+  font-family: 'Roboto';
+  font-weight: 700;
+  font-style: normal;
+  src: url('/static/fonts/Roboto/Roboto-Bold.ttf');
+}
+
+@font-face {
+  font-family: 'Roboto';
+  font-weight: 400;
+  font-style: italic;
+  src: url('/static/fonts/Roboto/Roboto-Italic.ttf');
+}
+
+@font-face {
+  font-family: 'Crimson Text';
+  font-weight: 400;
+  font-style: normal;
+  src: url('/static/fonts/Crimson_Text/CrimsonText-Regular.ttf');
+}
+
+@font-face {
+  font-family: 'Crimson Text';
+  font-weight: 700;
+  font-style: normal;
+  src: url('/static/fonts/Crimson_Text/CrimsonText-Bold.ttf');
+}
+
+@font-face {
+  font-family: 'Crimson Text';
+  font-weight: 400;
+  font-style: italic;
+  src: url('/static/fonts/Crimson_Text/CrimsonText-Italic.ttf');
+}
+
+@font-face {
+  font-family: 'Source Serif Pro';
+  font-weight: 400;
+  font-style: normal;
+  src: url('/static/fonts/Source_Serif_Pro/SourceSerifPro-Regular.ttf');
+}
+
+@font-face {
+  font-family: 'Source Serif Pro';
+  font-weight: 700;
+  font-style: normal;
+  src: url('/static/fonts/Source_Serif_Pro/SourceSerifPro-Bold.ttf');
+}
+
+@font-face {
+  font-family: 'Source Serif Pro';
+  font-weight: 400;
+  font-style: italic;
+  src: url('/static/fonts/Source_Serif_Pro/SourceSerifPro-Italic.ttf');
+}
+
 @font-face {
   font-family: 'SF Mono';
   font-weight: 400;