From 7396fd75c99ab887dd385bcf762074d1cbc602be Mon Sep 17 00:00:00 2001 From: Joel Glovier Date: Thu, 8 Jun 2017 13:38:51 -0400 Subject: [PATCH 1/2] Fixes #28 --- _layouts/resume.html | 4 ++-- _sass/_resume.scss | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/_layouts/resume.html b/_layouts/resume.html index c0db2be7e..21e105fcb 100644 --- a/_layouts/resume.html +++ b/_layouts/resume.html @@ -75,8 +75,8 @@

Education

{% for education in site.data.education %}

{{ education.uni }}

-

{{ education.degree }}{{ education.year }}

-
{{ education.awards }}
+

{{ education.degree }}{{ education.year }}

+
{{ education.awards }}

{{ education.summary }}

{% endfor %} diff --git a/_sass/_resume.scss b/_sass/_resume.scss index 5f47551c3..ef2bfbb57 100644 --- a/_sass/_resume.scss +++ b/_sass/_resume.scss @@ -144,6 +144,10 @@ font-size: 1.125rem; margin: 0 0 .75rem; line-height: 1; + + &.award-title { + font-size: 1rem; + } } .resume-item-title, From 7ce0a68da6a1b60ccf59876df5ca58e9e8fe777b Mon Sep 17 00:00:00 2001 From: Joel Glovier Date: Thu, 8 Jun 2017 13:58:29 -0400 Subject: [PATCH 2/2] remove inline styles added in #15 In my haste to get #15 merged (after letting it wait in limbo for a very long time) I overlooked the inline styles added in that PR. This commit moves them into the CSS. --- _layouts/resume.html | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/_layouts/resume.html b/_layouts/resume.html index 21e105fcb..28b1ec20b 100644 --- a/_layouts/resume.html +++ b/_layouts/resume.html @@ -55,8 +55,8 @@

Experience

{% for job in site.data.experience %}

{{ job.company }}

-

{{ job.position }}{{ job.duration }}


-

{{ job.summary }}

+

{{ job.position }} • {{ job.duration }}

+

{{ job.summary }}

{% endfor %} @@ -75,7 +75,7 @@

Education

{% for education in site.data.education %}

{{ education.uni }}

-

{{ education.degree }}{{ education.year }}

+

{{ education.degree }} • {{ education.year }}

{{ education.awards }}

{{ education.summary }}

@@ -95,8 +95,8 @@

Projects

{% for project in site.data.projects %}

{{ project.project }}

-

{{ project.role }}{{ project.duration }}


-

{{ project.description }}

+

{{ project.role }} • {{ project.duration }}

+

{{ project.description }}

{% endfor %}