From 7a0169e394fbec75bc16c56ac1d030af03da1c69 Mon Sep 17 00:00:00 2001
From: hacksalot <hacksalot@indevious.com>
Date: Fri, 22 Jan 2016 04:53:52 -0500
Subject: [PATCH] Capture.

---
 package.json                                  |  2 +-
 .../section/{interest.hbs => interests.hbs}   |  0
 themes/compact/src/compact-doc.xml            | 42 +------------------
 themes/compact/src/compact-html.css           |  2 +-
 themes/compact/src/compact-html.html          |  4 +-
 themes/compact/src/compact-pdf.css            |  2 +-
 themes/compact/src/compact-pdf.html           |  9 ++--
 themes/compact/theme.json                     |  3 ++
 themes/modern/src/modern-html.css             |  7 ++++
 9 files changed, 22 insertions(+), 49 deletions(-)
 rename partials/html/section/{interest.hbs => interests.hbs} (100%)

diff --git a/package.json b/package.json
index 8f9df5c..6a9d7f8 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "fresh-themes",
   "version": "0.14.0-beta",
-  "description": "Multiformat résumé themes and templates for HackMyResume and FluentCV.",
+  "description": "Multiformat themes and templates for your résumé / CV.",
   "repository": {
     "type": "git",
     "url": "https://github.com/fluentdesk/fresh-themes.git"
diff --git a/partials/html/section/interest.hbs b/partials/html/section/interests.hbs
similarity index 100%
rename from partials/html/section/interest.hbs
rename to partials/html/section/interests.hbs
diff --git a/themes/compact/src/compact-doc.xml b/themes/compact/src/compact-doc.xml
index c09dd24..d4aa11b 100644
--- a/themes/compact/src/compact-doc.xml
+++ b/themes/compact/src/compact-doc.xml
@@ -258,47 +258,7 @@
       </w:rPr>
     </w:style>
   </w:styles>
-  <w:docPr>
-    <w:view w:val="print"/>
-    <w:zoom w:percent="98"/>
-    <w:doNotEmbedSystemFonts/>
-    <w:defaultTabStop w:val="720"/>
-    <w:characterSpacingControl w:val="DontCompress"/>
-    <w:webPageEncoding w:val="unicode"/>
-    <w:optimizeForBrowser/>
-    <w:allowPNG/>
-    <w:validateAgainstSchema/>
-    <w:saveInvalidXML w:val="off"/>
-    <w:ignoreMixedContent w:val="off"/>
-    <w:alwaysShowPlaceholderText w:val="off"/>
-    <w:compat>
-      <w:breakWrappedTables/>
-    </w:compat>
-    <wsp:rsids>
-      <wsp:rsidRoot wsp:val="00C146CA"/>
-      <wsp:rsid wsp:val="000A3AF0"/>
-      <wsp:rsid wsp:val="001B7422"/>
-      <wsp:rsid wsp:val="002743C8"/>
-      <wsp:rsid wsp:val="002865F0"/>
-      <wsp:rsid wsp:val="002D3B7B"/>
-      <wsp:rsid wsp:val="00397D4D"/>
-      <wsp:rsid wsp:val="00437135"/>
-      <wsp:rsid wsp:val="00505903"/>
-      <wsp:rsid wsp:val="00606071"/>
-      <wsp:rsid wsp:val="006C2CFB"/>
-      <wsp:rsid wsp:val="00771B3E"/>
-      <wsp:rsid wsp:val="007D096C"/>
-      <wsp:rsid wsp:val="009452CA"/>
-      <wsp:rsid wsp:val="00A210E1"/>
-      <wsp:rsid wsp:val="00B43FDC"/>
-      <wsp:rsid wsp:val="00C146CA"/>
-      <wsp:rsid wsp:val="00C77315"/>
-      <wsp:rsid wsp:val="00CD3781"/>
-      <wsp:rsid wsp:val="00E578D4"/>
-      <wsp:rsid wsp:val="00EA0B64"/>
-      <wsp:rsid wsp:val="00FE101B"/>
-    </wsp:rsids>
-  </w:docPr>
+  {{> doc-pr }}
   <w:body>
     <wx:sect>
       <w:p wsp:rsidR="00C146CA" wsp:rsidRPr="00C146CA" wsp:rsidRDefault="007D096C" wsp:rsidP="00C146CA">
diff --git a/themes/compact/src/compact-html.css b/themes/compact/src/compact-html.css
index 2995932..52e47d7 100644
--- a/themes/compact/src/compact-html.css
+++ b/themes/compact/src/compact-html.css
@@ -1,5 +1,5 @@
 html, body, main, section, header, ul, p, h1, h2, h3 {
-  font-family: Calibri, 'Helvetica Neue', Helvetica, 'Segoe UI', sans-serif;
+  font-family: {{{fontList 'default'}}};
   font-size: 12px;
   margin: 0; padding: 0;
   display: block;
diff --git a/themes/compact/src/compact-html.html b/themes/compact/src/compact-html.html
index 3f91018..4f99aa4 100644
--- a/themes/compact/src/compact-html.html
+++ b/themes/compact/src/compact-html.html
@@ -4,7 +4,7 @@
     <meta charset="utf-8">
     <title>{{ RAW.name }}</title>
     <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/font-awesome/4.3.0/css/font-awesome.min.css">
-    {{{styleSheet "html.css"}}}
+    {{{styleSheet "compact-html.css"}}}
   </head>
   <body>
     <main>
@@ -35,6 +35,7 @@
 {{#*inline "icon-speaking"}}<span class="fa fa-users"></span>{{/inline}}
 {{#*inline "icon-testimonials"}}<span class="fa fa-thumbs-o-up"></span>{{/inline}}
 {{#*inline "icon-references"}}<span class="fa fa-thumbs-o-up"></span>{{/inline}}
+{{#*inline "icon-interests"}}<span class="fa fa-thumbs-o-up"></span>{{/inline}}
 
 {{#*inline "body-employment" }}
 <div>
@@ -96,6 +97,7 @@
 {{> section/speaking _icon="icon-speaking"}}
 {{> section/testimonials _icon="icon-testimonials"}}
 {{> section/references _icon="icon-references"}}
+{{> section/interests _icon="icon-interests"}}
 
     </main>
   </body>
diff --git a/themes/compact/src/compact-pdf.css b/themes/compact/src/compact-pdf.css
index 0e1740d..51ce196 100644
--- a/themes/compact/src/compact-pdf.css
+++ b/themes/compact/src/compact-pdf.css
@@ -1,5 +1,5 @@
 html, body, main, section, header, ul, p, h1, h2, h3 {
-  font-family: Calibri, 'Helvetica Neue', Helvetica, 'Segoe UI', sans-serif;
+  font-family: {{{fontList 'default'}}};
   font-size: 12px;
   margin: 0; padding: 0;
   display: block;
diff --git a/themes/compact/src/compact-pdf.html b/themes/compact/src/compact-pdf.html
index 174de23..4f99aa4 100644
--- a/themes/compact/src/compact-pdf.html
+++ b/themes/compact/src/compact-pdf.html
@@ -2,10 +2,9 @@
 <html>
   <head>
     <meta charset="utf-8">
-    <title>{{ r.name }}</title>
-    <style>
-    {{{ cssInfo.data }}}
-    </style>
+    <title>{{ RAW.name }}</title>
+    <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/font-awesome/4.3.0/css/font-awesome.min.css">
+    {{{styleSheet "compact-html.css"}}}
   </head>
   <body>
     <main>
@@ -36,6 +35,7 @@
 {{#*inline "icon-speaking"}}<span class="fa fa-users"></span>{{/inline}}
 {{#*inline "icon-testimonials"}}<span class="fa fa-thumbs-o-up"></span>{{/inline}}
 {{#*inline "icon-references"}}<span class="fa fa-thumbs-o-up"></span>{{/inline}}
+{{#*inline "icon-interests"}}<span class="fa fa-thumbs-o-up"></span>{{/inline}}
 
 {{#*inline "body-employment" }}
 <div>
@@ -97,6 +97,7 @@
 {{> section/speaking _icon="icon-speaking"}}
 {{> section/testimonials _icon="icon-testimonials"}}
 {{> section/references _icon="icon-references"}}
+{{> section/interests _icon="icon-interests"}}
 
     </main>
   </body>
diff --git a/themes/compact/theme.json b/themes/compact/theme.json
index 1fd95c4..16303d0 100644
--- a/themes/compact/theme.json
+++ b/themes/compact/theme.json
@@ -6,5 +6,8 @@
   "inherits": {
     "txt": "basis",
     "md": "basis"
+  },
+  "fonts": {
+    "default": ["Calibri", "Helvetica Neue", "Helvetica", "Segoe UI", "sans-serif"]
   }
 }
diff --git a/themes/modern/src/modern-html.css b/themes/modern/src/modern-html.css
index e343c35..37f4b57 100644
--- a/themes/modern/src/modern-html.css
+++ b/themes/modern/src/modern-html.css
@@ -1,3 +1,10 @@
+{{!
+
+  Templatized CSS file for the Modern theme. Expanded by Handlebars during
+  resume generation.
+
+}}
+
 * {
   box-sizing: border-box;
 }