From 632cb1c2444d5b13235ce03f3db97545513cbe0f Mon Sep 17 00:00:00 2001 From: David Sivocha Date: Sun, 2 Dec 2018 12:20:00 +0530 Subject: [PATCH 1/5] Make more an optional section Adds a check to see if more content is defined and then display more if it is. --- _layouts/default.html | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/_layouts/default.html b/_layouts/default.html index 3d305d46c..ba865d614 100644 --- a/_layouts/default.html +++ b/_layouts/default.html @@ -24,7 +24,9 @@ {%- include education.html -%} {%- endif -%} - {%- include more.html -%} + {%- if site.more_content -%} + {%- include more.html -%} + {%- endif -%} From 83f2488e7283452288de21e5e4160661dc464fa2 Mon Sep 17 00:00:00 2001 From: James Grant Date: Sun, 2 Dec 2018 13:57:12 +0000 Subject: [PATCH 2/5] Added titles to the social icons --- _includes/header.html | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/_includes/header.html b/_includes/header.html index 26b53fd73..e11028c65 100644 --- a/_includes/header.html +++ b/_includes/header.html @@ -9,70 +9,70 @@

{{ site.title | escape }}

{%- if site.dribbble_username -%}
  • - +
    • {%- endif -%} {%- if site.facebook_username -%}
  • - +
    • {%- endif -%} {%- if site.flickr_username -%}
  • - +
    • {%- endif -%} {%- if site.github_username -%}
  • - +
    • {%- endif -%} {%- if site.instagram_username -%}
  • - +
    • {%- endif -%} {%- if site.linkedin_username -%}
  • - +
    • {%- endif -%} {%- if site.pinterest_username -%}
  • - +
    • {%- endif -%} {%- if site.twitter_username -%}
  • - +
    • {%- endif -%} {%- if site.youtube_username -%}
  • - +
    • {%- endif -%} {%- if site.googleplus_username -%}
  • - +
    • {%- endif -%} From 0acdcef5cce63d3519dc2a5f4fef375cf6d83e42 Mon Sep 17 00:00:00 2001 From: James Grant Date: Sun, 2 Dec 2018 13:58:44 +0000 Subject: [PATCH 3/5] Added title text to projects github icons --- _includes/projects.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_includes/projects.html b/_includes/projects.html index 3e711a270..23eed7e1b 100644 --- a/_includes/projects.html +++ b/_includes/projects.html @@ -9,7 +9,7 @@

    {{ project.name }}

    {%- endif -%}

    - +

    From 4789536fc4559dfeb6f5c1cc2706ae11798a8f8a Mon Sep 17 00:00:00 2001 From: James Grant Date: Sun, 2 Dec 2018 14:34:58 +0000 Subject: [PATCH 4/5] Added super simple print styles, nothing fancy just to make print acceptable --- _includes/about.html | 4 +-- _includes/education.html | 4 +-- _includes/experience.html | 4 +-- _includes/header.html | 2 +- _includes/projects.html | 6 ++-- _sass/base.scss | 66 +++++++++++++++++++++++++++++++++++++++ _sass/type.scss | 8 +++++ assets/main.scss | 20 +++++++++--- 8 files changed, 99 insertions(+), 15 deletions(-) diff --git a/_includes/about.html b/_includes/about.html index 6e99d6931..d8de04ccf 100644 --- a/_includes/about.html +++ b/_includes/about.html @@ -2,11 +2,11 @@

    {{ site.about_title | default: "About Me" }}

    {%- if site.about_profile_image -%} -
    +
    {%- endif -%} -
    +
    {{ site.about_content | strip | markdownify }}
    diff --git a/_includes/education.html b/_includes/education.html index 921593d7c..1236b2b81 100644 --- a/_includes/education.html +++ b/_includes/education.html @@ -2,12 +2,12 @@

    {{ site.education_title | default: "Education" }}

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

    {{ education.name }}

    {{ education.qualification }}

    {{ education.dates }}

    -
    +
    {%- if education.quote -%}

    {{ education.quote }}

    {%- endif -%} diff --git a/_includes/experience.html b/_includes/experience.html index afa38c6e9..547bf1491 100644 --- a/_includes/experience.html +++ b/_includes/experience.html @@ -2,7 +2,7 @@

    {{ site.experience_title | default: "Experience" }}

    {% for experience in site.data.experience %}
    -
    +

    {%- if experience.link -%} @@ -15,7 +15,7 @@

    {{ experience.job_title }}

    {{ experience.dates }}

    -
    +
    {%- if experience.quote -%}

    {{ experience.quote }}

    {%- endif -%} diff --git a/_includes/header.html b/_includes/header.html index 26b53fd73..fa9115799 100644 --- a/_includes/header.html +++ b/_includes/header.html @@ -5,7 +5,7 @@

    {{ site.name | escape }}

    {{ site.title | escape }}

    -
      +
        {%- if site.dribbble_username -%}
      • diff --git a/_includes/projects.html b/_includes/projects.html index 3e711a270..e51972e20 100644 --- a/_includes/projects.html +++ b/_includes/projects.html @@ -2,18 +2,18 @@

        {{ site.projects_title | default: "Projects" }}

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

        {{ project.name }}

        {%- if project.link -%}         {{ project.link }} {%- endif -%} -

        +

        -
        +
        {%- if project.quote -%}

        {{ project.quote }}

        {%- endif -%} diff --git a/_sass/base.scss b/_sass/base.scss index 5de657ba4..dcf07f49c 100644 --- a/_sass/base.scss +++ b/_sass/base.scss @@ -155,7 +155,12 @@ body { .container { margin-top:30px; + + @media print { + margin-top: 20px; + } } + .header-contianer { margin-top:50px; } @@ -166,9 +171,70 @@ body { .header-left { margin-top: 30px; + + @media print { + margin-top: 0px; + } } .header-right p { font-size: 1.6em; text-align: right; } + +@media print { + a[href]:after { + content: none !important; + } + + img[src]:after { + content: none !important; + } + + .col-sm-1, .col-sm-2, .col-sm-3, .col-sm-4, .col-sm-5, .col-sm-6, .col-sm-7, .col-sm-8, .col-sm-9, .col-sm-10, .col-sm-11, .col-sm-12 { + float: left; + } + .col-sm-12 { + width: 100%; + } + .col-sm-11 { + width: 91.66666667%; + } + .col-sm-10 { + width: 83.33333333%; + } + .col-sm-9 { + width: 75%; + } + .col-sm-8 { + width: 66.66666667%; + } + .col-sm-7 { + width: 58.33333333%; + } + .col-sm-6 { + width: 50%; + } + .col-sm-5 { + width: 41.66666667%; + } + .col-sm-4 { + width: 33.33333333%; + } + .col-sm-3 { + width: 25%; + } + .col-sm-2 { + width: 16.66666667%; + } + .col-sm-1 { + width:8.33333333%; + } + .col-print-12 { + width: 100%; + } + + .no-print, .no-print * { + display: none !important; + } +} diff --git a/_sass/type.scss b/_sass/type.scss index 579880b9f..170f2ee6c 100644 --- a/_sass/type.scss +++ b/_sass/type.scss @@ -4,6 +4,10 @@ body { font-feature-settings: "kern", "liga", "pnum"; font-size: 1em; line-height: 1.5; + + @media print { + font-size: 0.9em; + } } h1, @@ -49,6 +53,10 @@ h3 { border-bottom: dashed 2px #CCCCCC; padding-bottom: 10px; margin-bottom:40px; + + @media print { + margin-bottom: 20px; + } } h4 { diff --git a/assets/main.scss b/assets/main.scss index cf4f36e68..448a69ba3 100644 --- a/assets/main.scss +++ b/assets/main.scss @@ -44,7 +44,7 @@ ul.icons a { text-align: right; } -@media (max-width: 768px) { +@media screen and (max-width: 768px) { .icons { text-align: center; } @@ -59,7 +59,7 @@ ul.icons a { font-weight:500; } -@media (max-width: 768px) { +@media screen and (max-width: 768px) { .header-contianer div{ text-align: center; } @@ -89,12 +89,12 @@ ul.icons a { } .into-text-1 { - margin-top:30px; + margin-top: 30px; } @media only screen and (max-width : 992px) { .into-text-1 { - margin-top:20px; + margin-top: 20px; } } @@ -121,7 +121,7 @@ ul.icons a { } } - @media (max-width: 768px) { + @media screen and (max-width: 768px) { text-align: center; p { @@ -147,6 +147,10 @@ ul.icons a { margin-bottom: 0.4em; font-weight: 500; + @media print { + margin-bottom: 0.2em; + } + a { font-weight: 500; } @@ -192,4 +196,10 @@ p.quote { font-style: italic; padding: 1em 2.5em; text-align: center; + + @media print { + text-align: left; + padding: 0em 1em; + margin-top: 1em; + } } From 5683c172d4689ba9d78ebb9c23d7e4960b951460 Mon Sep 17 00:00:00 2001 From: James Grant Date: Sun, 2 Dec 2018 15:05:42 +0000 Subject: [PATCH 5/5] Bumped release 1.3 --- lib/modern-resume-theme/version.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/modern-resume-theme/version.rb b/lib/modern-resume-theme/version.rb index d48cfda5d..201058d5a 100644 --- a/lib/modern-resume-theme/version.rb +++ b/lib/modern-resume-theme/version.rb @@ -1,3 +1,3 @@ module ModernResumeTheme - VERSION = "1.2.1" + VERSION = "1.3.0" end