diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 3503035..251859c 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -12,7 +12,7 @@ jobs: - name: Setup Node.js uses: actions/setup-node@v1 with: - node-version: 12 + node-version: 14 - name: Install run: npm ci diff --git a/index.js b/index.js index 4132359..98b56ea 100644 --- a/index.js +++ b/index.js @@ -17,6 +17,12 @@ fs.readdirSync(partialsDir) Handlebars.registerPartial(path.basename(filename, extname), template), ) +Handlebars.registerHelper('formatCountry', countryCode => + Intl.DisplayNames + ? new Intl.DisplayNames(['en'], { type: 'region' }).of(countryCode) + : countryCode, +) + Handlebars.registerHelper('formatDate', dateString => new Date(dateString).toLocaleDateString('en', { month: 'short', @@ -24,6 +30,10 @@ Handlebars.registerHelper('formatDate', dateString => }), ) +Handlebars.registerHelper('formatPhone', phone => + phone.replace(/[^\d|+]+/g, ''), +) + Handlebars.registerHelper('formatURL', url => url.replace(/^(https?:|)\/\//, '').replace(/\/$/, ''), ) diff --git a/partials/contact.hbs b/partials/contact.hbs deleted file mode 100644 index 0a37d20..0000000 --- a/partials/contact.hbs +++ /dev/null @@ -1,23 +0,0 @@ -
-

Contact

-
- {{#email}} -
-

Email

- {{.}} -
- {{/email}} - {{#phone}} -
-

Phone

- {{.}} -
- {{/phone}} - {{#url}} -
-

Website

- {{formatURL .}} -
- {{/url}} -
-
diff --git a/partials/header.hbs b/partials/header.hbs index fe510db..1d19409 100644 --- a/partials/header.hbs +++ b/partials/header.hbs @@ -1,8 +1,38 @@
- {{#name}} -

{{.}}

- {{/name}} - {{#label}} -

{{.}}

- {{/label}} +
+ {{#name}} +

{{.}}

+ {{/name}} + {{#label}} +

{{.}}

+ {{/label}} +
+
diff --git a/resume.hbs b/resume.hbs index 1237cb8..e67c1d0 100644 --- a/resume.hbs +++ b/resume.hbs @@ -11,7 +11,6 @@ {{#resume.basics}} {{> header}} - {{> contact}} {{> about}} {{> profiles}} {{/resume.basics}} diff --git a/style.css b/style.css index 36ace50..0ba640e 100644 --- a/style.css +++ b/style.css @@ -57,7 +57,7 @@ ul { } li + li { - margin-top: 0.2em; + margin-top: 0.4em; } li::marker { @@ -130,6 +130,16 @@ cite::before { content: '— '; } +svg { + fill: none; + margin-right: 0.2em; + stroke: currentColor; + stroke-linecap: round; + stroke-linejoin: round; + stroke-width: 2; + vertical-align: -0.2em; +} + .masthead { background: var(--mutedColor); display: inherit; @@ -137,7 +147,6 @@ cite::before { grid-column: full; grid-template-columns: inherit; padding: 4em 0; - row-gap: 0; } .masthead > *, @@ -155,6 +164,11 @@ blockquote > * + * { gap: 1.5em; } +.icon-list { + list-style: none; + padding: 0; +} + .grid-list { display: grid; gap: 1em; diff --git a/tap-snapshots/test-render.js-TAP.test.js b/tap-snapshots/test-render.js-TAP.test.js index 4c05af5..6a7ddb1 100644 --- a/tap-snapshots/test-render.js-TAP.test.js +++ b/tap-snapshots/test-render.js-TAP.test.js @@ -73,7 +73,7 @@ ul { } li + li { - margin-top: 0.2em; + margin-top: 0.4em; } li::marker { @@ -146,6 +146,16 @@ cite::before { content: '— '; } +svg { + fill: none; + margin-right: 0.2em; + stroke: currentColor; + stroke-linecap: round; + stroke-linejoin: round; + stroke-width: 2; + vertical-align: -0.2em; +} + .masthead { background: var(--mutedColor); display: inherit; @@ -153,7 +163,6 @@ cite::before { grid-column: full; grid-template-columns: inherit; padding: 4em 0; - row-gap: 0; } .masthead > *, @@ -171,6 +180,11 @@ blockquote > * + * { gap: 1.5em; } +.icon-list { + list-style: none; + padding: 0; +} + .grid-list { display: grid; gap: 1em; @@ -230,26 +244,29 @@ blockquote > * + * {
-

Richard Hendriks

-

Programmer

-
-
-

Contact

-
-
-

Email

- richard.hendriks@mail.com -
-
-

Phone

- (912) 555-4321 -
-
-

Website

- richardhendricks.example.com -
+
+

Richard Hendriks

+

Programmer

-
+ +

About

diff --git a/test/render.js b/test/render.js index bf6eed7..deff04d 100644 --- a/test/render.js +++ b/test/render.js @@ -12,6 +12,7 @@ test('renders a resume', t => { test('renders valid HTML', t => { const htmlvalidate = new HtmlValidate({ extends: ['html-validate:recommended'], + rules: { 'svg-focusable': 'off' }, }) const {