From e9b4d747d75bbddb75e6045ef4300ce2eebf0872 Mon Sep 17 00:00:00 2001
From: hacksalot <hacksalot@indevious.com>
Date: Sat, 23 Jan 2016 06:18:18 -0500
Subject: [PATCH] Theme: Modern: Update font usage.

---
 themes/modern/src/modern-html.css |  2 +-
 themes/modern/src/modern-pdf.css  |  2 +-
 themes/modern/theme.json          | 27 ++++++++++++---------------
 3 files changed, 14 insertions(+), 17 deletions(-)

diff --git a/themes/modern/src/modern-html.css b/themes/modern/src/modern-html.css
index 37f4b57..9f33cee 100644
--- a/themes/modern/src/modern-html.css
+++ b/themes/modern/src/modern-html.css
@@ -14,7 +14,7 @@ main {
 }
 
 body {
-  font-family: {{{fontList 'default-html'}}};
+  font-family: {{{fontList 'default'}}};
   font-size: 15px;
   color: #333;
   line-height: 1.42857143;
diff --git a/themes/modern/src/modern-pdf.css b/themes/modern/src/modern-pdf.css
index 22d082f..02927ee 100644
--- a/themes/modern/src/modern-pdf.css
+++ b/themes/modern/src/modern-pdf.css
@@ -7,7 +7,7 @@ main {
 }
 
 body {
-  font-family: {{{fontList 'default-html'}}};
+  font-family: {{{fontList 'default'}}};
   font-size: 15px;
   color: #333;
   line-height: 1.42857143;
diff --git a/themes/modern/theme.json b/themes/modern/theme.json
index 0d3e20c..909a9aa 100644
--- a/themes/modern/theme.json
+++ b/themes/modern/theme.json
@@ -12,20 +12,17 @@
     "md": "basis"
   },
   "fonts": {
-    "default": [
-      "Segoe UI",
-      "Calibri",
-      "Helvetica Neue",
-      "Helvetica",
-      "sans-serif"
-    ],
-    "default-html": [
-      "Helvetica Neue",
-      "Helvetica",
-      "Lato",
-      "sans-serif"
-    ],
-    "heading1": ["xkcd"],
-    "heading2": ["xkcd"]
+    "all": {
+      "default": [ "Helvetica Neue", "Helvetica", "Segoe UI", "Calibri", "sans-serif" ],
+      "heading1": ["Arial"],
+      "heading2": ["Arial"]
+    },
+    "doc": {
+      "default": "Calibri",
+      "heading1": "Trebuchet MS",
+      "heading2": "Segoe UI",
+      "heading3": "Calibri"
+    }
   }
+
 }