From b57272ef4c8d4f26a29bf65745abf9d829fc75fe Mon Sep 17 00:00:00 2001 From: hacksalot Date: Tue, 12 Jan 2016 22:13:33 -0500 Subject: [PATCH] Move comments from Compact to Modern. --- themes/compact/src/compact-html.html | 151 +++------------------------ themes/modern/src/modern-html.html | 151 +++++++++++++++++++++++---- 2 files changed, 150 insertions(+), 152 deletions(-) diff --git a/themes/compact/src/compact-html.html b/themes/compact/src/compact-html.html index 441149b..0076f95 100644 --- a/themes/compact/src/compact-html.html +++ b/themes/compact/src/compact-html.html @@ -1,129 +1,29 @@ - - - {{! }} {{ RAW.name }} - - - {{! }} - {{{styleSheet "html.css"}}} - - {{! }} -
- - {{! }} -

{{{ r.name }}}

- - - {{! }}
{{#has 'contact.email'}}{{/has}} {{#has 'contact.phone'}}
{{ RAW.contact.phone }}
{{/has}} {{#has 'contact.website'}}{{/has}}
-
{{!}} -{{#has "info.brief"}} -
- - {{!}} - {{{ r.info.brief }}} - -
-{{/has}} - - - -{{! }} - {{#*inline "icon-skills"}}{{/inline}} -{{> section/skills _icon="icon-skills"}} - -{{! }} - {{#*inline "icon-employment"}}{{/inline}} {{#*inline "icon-projects"}}{{/inline}} {{#*inline "icon-education"}}{{/inline}} @@ -135,24 +35,6 @@ {{#*inline "icon-testimonials"}}{{/inline}} {{#*inline "icon-references"}}{{/inline}} -{{! }} - - {{#*inline "body-employment" }}

{{ position }}, @@ -171,13 +53,6 @@

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

{{ role }}, @@ -196,13 +71,21 @@

{{/inline}} +{{!}} + +{{#has "info.brief"}} +
+ {{{ r.info.brief }}} +
+{{/has}} + +{{> section/skills _icon="icon-skills"}} +{{> section/employment _icon="icon-employment"}} {{> section/projects _icon="icon-projects"}} - -{{! }} - {{> section/education _icon="icon-education"}} {{> section/service _icon="icon-service"}} {{> section/samples _icon="icon-samples"}} diff --git a/themes/modern/src/modern-html.html b/themes/modern/src/modern-html.html index 79d4ed7..90ff5c5 100644 --- a/themes/modern/src/modern-html.html +++ b/themes/modern/src/modern-html.html @@ -2,16 +2,58 @@ - {{ r.name }} + {{! }} + {{ RAW.name }} + + {{! }} + {{{styleSheet "modern-html.css"}}} + + {{! }} +
+ + {{! }} +

{{{ r.name }}}

+ + {{! }}
{{#has r.contact.email}}{{/has}} {{#has r.contact.phone}}
{{ RAW.contact.phone }}
{{/has}} @@ -20,16 +62,50 @@
-{{#if r.info.brief}} +{{!}} + +{{#has 'info.brief'}}
+ + {{!}} +

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

+ + {{!}} + {{{ r.info.brief }}}
-{{/if}} +{{/has}} -{{!}} +{{! }} {{#section 'skills' }}
@@ -60,6 +136,32 @@ {{/section}} +{{! }} {{#*inline "icon-employment"}}{{/inline}} @@ -83,6 +185,10 @@ {{> section/employment _icon="icon-employment"}} +{{! }} + {{#*inline "body-projects" }}

{{#if role}}{{camelCase role }},{{/if}} @@ -105,28 +211,37 @@ {{> section/projects _icon="icon-projects"}} + +{{! }} + {{#*inline "icon-education"}}{{/inline}} -{{> section/education _icon="icon-education"}} - {{#*inline "icon-service"}}{{/inline}} -{{> section/service _icon="icon-service"}} - {{#*inline "icon-samples"}}{{/inline}} -{{> section/samples _icon="icon-samples"}} - {{#*inline "icon-writing"}}{{/inline}} -{{> section/writing _icon="icon-writing"}} - {{#*inline "icon-recognition"}}{{/inline}} -{{> section/recognition _icon="icon-recognition"}} - {{#*inline "icon-speaking"}}{{/inline}} -{{> section/speaking _icon="icon-speaking"}} - {{#*inline "icon-testimonials"}}{{/inline}} -{{> section/testimonials _icon="icon-testimonials"}} - {{#*inline "icon-references"}}{{/inline}} + +{{! }} + +{{> 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"}}