diff --git a/partials/doc/doc-fonts.xml b/partials/doc/doc-fonts.xml index 2eefce9..f50ad53 100644 --- a/partials/doc/doc-fonts.xml +++ b/partials/doc/doc-fonts.xml @@ -1,12 +1,42 @@ +{{! + The w:fonts node contains font setup information for the Word document, + including the default font as well as optional descriptions of fonts via + the element. + + This node is optional, but if omitted, Word will create a default + section on save, with defaults (like Times New Roman) that are probably not + ideal for a specific use case. So we include this section by default, and set + the fonts to the theme's declared typography settings. +}} + - - + {{! + The defaultFonts element defines the font to use when no other font or + formatting is specified. It's optional, but if not specified, Word will + fill it in to a default value. (Usually, it sets all four font families + to "Times New Roman"). + }} + + + {{! + Here go individual entries. These are not required to actually use + any fonts, but are used by Word when it has to reconstruct a missing font. + Since fonts are not embedded into Word documents, this allows Word to + display the document without losing too much visual fidelity. + + In a standard Word document, this first entry would also be set to Times + New Roman. + }} + + + + @@ -14,4 +44,5 @@ + diff --git a/partials/doc/doc-styles.xml b/partials/doc/doc-styles.xml index 7719fc6..23bc6ec 100644 --- a/partials/doc/doc-styles.xml +++ b/partials/doc/doc-styles.xml @@ -3,8 +3,8 @@ - - + + @@ -26,7 +26,8 @@ - + + @@ -44,7 +45,8 @@ - + + @@ -117,7 +119,8 @@ - + + @@ -152,7 +155,8 @@ - + + diff --git a/themes/modern/src/modern-html.css b/themes/modern/src/modern-html.css index 9c6ab92..e343c35 100644 --- a/themes/modern/src/modern-html.css +++ b/themes/modern/src/modern-html.css @@ -7,7 +7,7 @@ main { } body { - font-family: 'Helvetica Neue', Helvetica, 'Lato', sans-serif; + font-family: {{{fontList 'default-html'}}}; 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 9c6ab92..22d082f 100644 --- a/themes/modern/src/modern-pdf.css +++ b/themes/modern/src/modern-pdf.css @@ -7,7 +7,7 @@ main { } body { - font-family: 'Helvetica Neue', Helvetica, 'Lato', sans-serif; + font-family: {{{fontList 'default-html'}}}; font-size: 15px; color: #333; line-height: 1.42857143; @@ -17,7 +17,7 @@ body { } /* Typical page borders are awkward when rendered to PDF. */ -body.pdf { +body { background-color: #FFFFFF; } @@ -30,7 +30,7 @@ the PDF case,
for the HTML case, and style both via an ID. */ border: 1px solid #E6E6E6; } -body.pdf > #main { +body > #main { border: none; } diff --git a/themes/modern/src/modern-pdf.html b/themes/modern/src/modern-pdf.html index db0ff88..2cc4ae7 100644 --- a/themes/modern/src/modern-pdf.html +++ b/themes/modern/src/modern-pdf.html @@ -1,22 +1,94 @@ +{{! }} + - - - {{ r.name }} - + + {{! }} + {{ RAW.name }} + + {{!}} + - {{ headFragment }} - + + {{! }} + + {{{styleSheet "modern-pdf.css" "embed"}}} + + {{! }} + + + {{!}} +
{{!}}
+ + {{! }} +

{{{ r.name }}}

+ + {{! }}
{{#has r.contact.email}}{{/has}} {{#has r.contact.phone}}
{{ RAW.contact.phone }}
{{/has}} @@ -24,18 +96,58 @@
+ +{{!}} + {{#has 'info.brief'}}
+ {{!}} +

{{{sectionTitle "info" "About"}}}

+ {{!}} + {{{ r.info.brief }}}
{{/has}} +{{! }} + + {{#section 'skills' }}
@@ -65,8 +177,49 @@
{{/section}} +{{! }} + + +{{!}} + {{#*inline "icon-employment"}}{{/inline}} + +{{!}} + {{#*inline "body-employment" }}

{{ position }}, @@ -85,9 +238,22 @@

{{/inline}} +{{! }} + {{> section/employment _icon="icon-employment"}} +{{! }} + + {{#*inline "body-projects" }}

{{#if role}}{{camelCase role }},{{/if}} @@ -110,18 +276,57 @@ {{> section/projects _icon="icon-projects"}} +{{! }} + + +{{#*inline "body-education" }} +
+

{{#if title}}{{ title }},{{/if}} +{{#if url}} +{{ institution }} +{{else}} +{{ institution }} +{{/if}} +

+{{#if start}}{{dateRange .}}{{/if}} +{{#if curriculum}} +{{#if start}}| {{/if}}{{#each curriculum}}{{{ . }}} {{/each}} +{{/if}} +{{{ summary }}} +{{> highlights }} +
+{{/inline}} + {{#*inline "icon-education"}}{{/inline}} + +{{> section/education _icon="icon-education"}} + + +{{! }} + {{#*inline "icon-service"}}{{/inline}} +{{#*inline "icon-affiliation"}}{{/inline}} {{#*inline "icon-samples"}}{{/inline}} {{#*inline "icon-writing"}}{{/inline}} {{#*inline "icon-reading"}}{{/inline}} {{#*inline "icon-recognition"}}{{/inline}} {{#*inline "icon-speaking"}}{{/inline}} -{{#*inline "icon-testimonials"}}{{/inline}} +{{#*inline "icon-testimonials"}}{{/inline}} {{#*inline "icon-references"}}{{/inline}} -{{> section/education _icon="icon-education"}} +{{! }} + {{> section/service _icon="icon-service"}} +{{> section/affiliation _icon="icon-affiliation"}} {{> section/samples _icon="icon-samples"}} {{> section/writing _icon="icon-writing"}} {{> section/reading _icon="icon-reading"}} diff --git a/themes/modern/theme.json b/themes/modern/theme.json index 91d39c9..0d3e20c 100644 --- a/themes/modern/theme.json +++ b/themes/modern/theme.json @@ -10,5 +10,22 @@ "inherits": { "txt": "basis", "md": "basis" + }, + "fonts": { + "default": [ + "Segoe UI", + "Calibri", + "Helvetica Neue", + "Helvetica", + "sans-serif" + ], + "default-html": [ + "Helvetica Neue", + "Helvetica", + "Lato", + "sans-serif" + ], + "heading1": ["xkcd"], + "heading2": ["xkcd"] } } diff --git a/themes/positive/src/positive-doc.xml b/themes/positive/src/positive-doc.xml index b7236ca..a410140 100644 --- a/themes/positive/src/positive-doc.xml +++ b/themes/positive/src/positive-doc.xml @@ -2,449 +2,11 @@ - - Resume for {{ r.name }} - {{ r.name }} - resume;CV - {{ r.name }} - 1 - 60 - 2015-12-16T17:38:00Z - 2015-12-16T18:32:00Z - 1 - 241 - 1379 - 11 - 3 - 1617 - 15 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + {{> doc-properties }} + {{> doc-fonts }} + {{> doc-lists }} + {{> doc-styles }} + {{> doc-pr }} diff --git a/themes/positive/theme.json b/themes/positive/theme.json index b765ad5..583d227 100644 --- a/themes/positive/theme.json +++ b/themes/positive/theme.json @@ -6,5 +6,20 @@ "inherits": { "txt": "basis", "md": "basis" + }, + "fonts": { + "default": [ + "Calibri", + "Open Sans", + "sans-serif" + ], + "default-html": [ + "Helvetica Neue" + "Helvetica", + "Lato", + "sans-serif" + ], + "heading1": ["xkcd"], + "heading2": ["xkcd"] } }