From e5dac59649fb79250e98fee4e1cb5cf4ff11514f Mon Sep 17 00:00:00 2001 From: hacksalot Date: Tue, 12 Jan 2016 21:29:30 -0500 Subject: [PATCH] Updates to Compact/Modern/Positive. --- themes/compact/src/compact-html.css | 25 ++-- themes/compact/src/compact-html.html | 199 ++++++++++++++++++++++---- themes/modern/src/modern-html.html | 44 +++++- themes/positive/src/positive-html.css | 19 ++- 4 files changed, 243 insertions(+), 44 deletions(-) diff --git a/themes/compact/src/compact-html.css b/themes/compact/src/compact-html.css index 0e1740d..2995932 100644 --- a/themes/compact/src/compact-html.css +++ b/themes/compact/src/compact-html.css @@ -45,12 +45,9 @@ li { margin-left: 2em; } -h3 { - margin-top: 1em; -} - p, li { text-align: justify; + clear: both; } .tenure { @@ -69,10 +66,8 @@ main > header { } -main > header > h1 { - float: left; - font-size: 1.5em; - text-transform: uppercase; +h3 { + display: inline-block; line-height: 1; } #contact { @@ -87,7 +82,19 @@ main > header > h1 { margin-left: 5px; } -h2 > span.fa { +span.fa { text-align: left; margin-right: 3px; + float: left; +} + +section > div { + margin-bottom: 1em; + clear: both; +} + +span.keywords { + font-size: 10px; + color: gray; + text-align: right; } diff --git a/themes/compact/src/compact-html.html b/themes/compact/src/compact-html.html index e419cb2..441149b 100644 --- a/themes/compact/src/compact-html.html +++ b/themes/compact/src/compact-html.html @@ -1,73 +1,216 @@ + + + {{! }} {{ RAW.name }} + + + {{! }} + {{{styleSheet "html.css"}}} + + {{! }} +
+ + {{! }} +

{{{ r.name }}}

+ + + {{! }}
{{#has 'contact.email'}}{{/has}} {{#has 'contact.phone'}}
{{ RAW.contact.phone }}
{{/has}} {{#has 'contact.website'}}
{{trimURL RAW.contact.website }}
{{/has}}
+
- +{{!}} {{#has "info.brief"}}
+ + {{!}} {{{ r.info.brief }}} +
{{/has}} -{{!}} + We could do this manually with custom HTML, but let's take advantage of + some predefined partials instead. FRESH provides global partials for all + resume sections (employment, skills, education, speaking, etc.). They're + named like this: -{{#*inline "icon-skills"}}{{/inline}} -{{> section/skills }} + section/skills + section/employment + section/service + section/recognition + etc.. -{{#*inline "icon-employment"}}{{/inline}} -{{> section/employment }} + So what we want to do is inject the "section/skills" global partial + and use it here in our theme. We can do that simply with: -{{#*inline "icon-projects"}}{{/inline}} -{{> section/projects }} + ((> section/skills )) -{{#*inline "icon-education"}}{{/inline}} -{{> section/education }} + However, in this case we also want to override the heading icon used + in the global partial. So we also declare what's known as an INLINE + PARTIAL, using ((#*inline "icon-skills")), and set its content to the + icon we'd like to display for the SKILLS section. The global partial + will reference this template by name, so it allows us to selectively + override that part of the global partial. +--> }} -{{#*inline "icon-service"}}{{/inline}} -{{> section/service }} +{{#*inline "icon-skills"}}{{/inline}} +{{> section/skills _icon="icon-skills"}} -{{#*inline "icon-samples"}}{{/inline}} -{{> section/samples }} +{{! }} -{{#*inline "icon-writing"}}{{/inline}} -{{> section/writing }} +{{#*inline "icon-employment"}}{{/inline}} +{{#*inline "icon-projects"}}{{/inline}} +{{#*inline "icon-education"}}{{/inline}} +{{#*inline "icon-service"}}{{/inline}} +{{#*inline "icon-samples"}}{{/inline}} +{{#*inline "icon-writing"}}{{/inline}} +{{#*inline "icon-recognition"}}{{/inline}} +{{#*inline "icon-speaking"}}{{/inline}} +{{#*inline "icon-testimonials"}}{{/inline}} +{{#*inline "icon-references"}}{{/inline}} -{{#*inline "icon-recognition"}}{{/inline}} -{{> section/recognition }} +{{! }} +{{#*inline "body-employment" }} +
+

{{ position }}, + {{#if url }} + {{ employer }} + {{else}} + {{ employer }} + {{/if}} +

+ {{dateRange .}} +

{{{ summary }}}

+ {{> highlights }} + {{#if keywords}} + {{#each keywords}}{{{ . }}} {{/each}} + {{/if}} +
+{{/inline}} + +{{> section/employment _icon="icon-employment"}} + + +{{! }} + +{{#*inline "body-projects" }} +
+

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

+ {{dateRange .}} +

{{{ summary }}}

+ {{> highlights }} + {{#if keywords}} + {{#each keywords}}{{{ . }}} {{/each}} + {{/if}} +
+{{/inline}} + +{{> section/projects _icon="icon-projects"}} + +{{! }} + +{{> section/education _icon="icon-education"}} +{{> section/service _icon="icon-service"}} +{{> section/samples _icon="icon-samples"}} +{{> section/writing _icon="icon-writing"}} +{{> section/recognition _icon="icon-recognition"}} +{{> section/speaking _icon="icon-speaking"}} +{{> section/testimonials _icon="icon-testimonials"}} +{{> section/references _icon="icon-references"}}
diff --git a/themes/modern/src/modern-html.html b/themes/modern/src/modern-html.html index c1867bd..79d4ed7 100644 --- a/themes/modern/src/modern-html.html +++ b/themes/modern/src/modern-html.html @@ -60,17 +60,49 @@ {{/section}} -{{!}} {{#*inline "icon-employment"}}{{/inline}} + +{{#*inline "body-employment" }} +
+

{{ position }}, + {{#if url }} + {{ employer }} + {{else}} + {{ employer }} + {{/if}} +

+ {{dateRange .}} + {{#if keywords}} + {{#if start}}| {{/if}}{{#each keywords}}{{{ . }}} {{/each}} + {{/if}} +

{{{ summary }}}

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

{{#if role}}{{camelCase role }},{{/if}} +{{#if url}} +{{ title }} +{{else}} +{{ title }} +{{/if}} +

+{{#if start}}{{dateRange .}}{{/if}} +{{#if keywords}} +{{#if start}}| {{/if}}{{#each keywords}}{{{ . }}} {{/each}} +{{/if}} +{{{ summary }}} +{{> highlights }} +
+{{/inline}} + {{#*inline "icon-projects"}}{{/inline}} + {{> section/projects _icon="icon-projects"}} {{#*inline "icon-education"}}{{/inline}} diff --git a/themes/positive/src/positive-html.css b/themes/positive/src/positive-html.css index 616c61e..c7e3dce 100644 --- a/themes/positive/src/positive-html.css +++ b/themes/positive/src/positive-html.css @@ -31,8 +31,12 @@ h2 { font-weight: 400; } +h3, .tenure { + font-size: 1.5em; + font-weight: 300; +} + h3 { - font-size: 1em; margin-top: 0; width: 66%; float: left; @@ -82,6 +86,10 @@ section > header { position: relative; } +ul { + clear: both; +} + li { margin-left: 2em; } @@ -92,6 +100,15 @@ p, li { .tenure { float: right; + color: #B5B5B5; + background-color: #F5F5F5; + border-radius: 6px; + padding: 0px 6px; +} + +span.keywords { + font-size: 10px; + color: #B16666; } thead {