Merge branch 'gh-pages' into yaml

.bundle/config

@@ -0,0 +1,3 @@
+---
+BUNDLE_PATH: "_vendor/bundle"
+BUNDLE_DISABLE_SHARED_GEMS: "true"

.gitignore

@@ -1,3 +1,4 @@
 _site
 .sass-cache
-.DS_Store
+.DS_Store
+_vendor

Gemfile.lock

@@ -1,126 +1,201 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    RedCloth (4.2.9)
+    activesupport (4.2.7)
-    activesupport (4.2.1)
       i18n (~> 0.7)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
       thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
-    blankslate (2.1.2.4)
+    addressable (2.5.0)
-    celluloid (0.16.0)
+      public_suffix (~> 2.0, >= 2.0.2)
-      timers (~> 4.0.0)
+    coffee-script (2.4.1)
-    classifier-reborn (2.0.3)
-      fast-stemmer (~> 1.0)
-    coffee-script (2.3.0)
       coffee-script-source
       execjs
-    coffee-script-source (1.9.1)
+    coffee-script-source (1.12.2)
-    colorator (0.1)
+    colorator (1.1.0)
-    execjs (2.4.0)
+    ethon (0.10.1)
-    fast-stemmer (1.0.2)
+      ffi (>= 1.3.0)
-    ffi (1.9.8)
+    execjs (2.7.0)
-    gemoji (2.1.0)
+    faraday (0.11.0)
-    github-pages (33)
+      multipart-post (>= 1.2, < 3)
-      RedCloth (= 4.2.9)
+    ffi (1.9.17)
-      github-pages-health-check (~> 0.2)
+    forwardable-extended (2.6.0)
-      jekyll (= 2.4.0)
+    gemoji (3.0.0)
+    github-pages (120)
+      activesupport (= 4.2.7)
+      github-pages-health-check (= 1.3.0)
+      jekyll (= 3.3.1)
+      jekyll-avatar (= 0.4.2)
       jekyll-coffeescript (= 1.0.1)
-      jekyll-mentions (= 0.2.1)
+      jekyll-default-layout (= 0.1.4)
-      jekyll-redirect-from (= 0.6.2)
+      jekyll-feed (= 0.8.0)
-      jekyll-sass-converter (= 1.2.0)
+      jekyll-gist (= 1.4.0)
-      jekyll-sitemap (= 0.6.3)
+      jekyll-github-metadata (= 2.3.1)
-      jemoji (= 0.4.0)
+      jekyll-mentions (= 1.2.0)
-      kramdown (= 1.5.0)
+      jekyll-optional-front-matter (= 0.1.2)
-      liquid (= 2.6.1)
+      jekyll-paginate (= 1.1.0)
-      maruku (= 0.7.0)
+      jekyll-readme-index (= 0.0.4)
+      jekyll-redirect-from (= 0.12.1)
+      jekyll-relative-links (= 0.3.0)
+      jekyll-sass-converter (= 1.5.0)
+      jekyll-seo-tag (= 2.1.0)
+      jekyll-sitemap (= 0.12.0)
+      jekyll-swiss (= 0.4.0)
+      jekyll-theme-architect (= 0.0.3)
+      jekyll-theme-cayman (= 0.0.3)
+      jekyll-theme-dinky (= 0.0.3)
+      jekyll-theme-hacker (= 0.0.3)
+      jekyll-theme-leap-day (= 0.0.3)
+      jekyll-theme-merlot (= 0.0.3)
+      jekyll-theme-midnight (= 0.0.3)
+      jekyll-theme-minimal (= 0.0.3)
+      jekyll-theme-modernist (= 0.0.3)
+      jekyll-theme-primer (= 0.1.7)
+      jekyll-theme-slate (= 0.0.3)
+      jekyll-theme-tactile (= 0.0.3)
+      jekyll-theme-time-machine (= 0.0.3)
+      jekyll-titles-from-headings (= 0.1.4)
+      jemoji (= 0.8.0)
+      kramdown (= 1.11.1)
+      liquid (= 3.0.6)
+      listen (= 3.0.6)
       mercenary (~> 0.3)
-      pygments.rb (= 0.6.1)
+      minima (= 2.0.0)
-      rdiscount (= 2.1.7)
+      nokogiri (= 1.6.8.1)
-      redcarpet (= 3.1.2)
+      rouge (= 1.11.1)
       terminal-table (~> 1.4)
-    github-pages-health-check (0.2.2)
+    github-pages-health-check (1.3.0)
-      net-dns (~> 0.6)
+      addressable (~> 2.3)
-      public_suffix (~> 1.4)
+      net-dns (~> 0.8)
-    hitimes (1.2.2)
+      octokit (~> 4.0)
-    html-pipeline (1.9.0)
+      public_suffix (~> 2.0)
+      typhoeus (~> 0.7)
+    html-pipeline (2.5.0)
       activesupport (>= 2)
-      nokogiri (~> 1.4)
+      nokogiri (>= 1.4)
-    i18n (0.7.0)
+    i18n (0.8.0)
-    jekyll (2.4.0)
+    jekyll (3.3.1)
-      classifier-reborn (~> 2.0)
+      addressable (~> 2.4)
-      colorator (~> 0.1)
+      colorator (~> 1.0)
-      jekyll-coffeescript (~> 1.0)
-      jekyll-gist (~> 1.0)
-      jekyll-paginate (~> 1.0)
       jekyll-sass-converter (~> 1.0)
       jekyll-watch (~> 1.1)
       kramdown (~> 1.3)
-      liquid (~> 2.6.1)
+      liquid (~> 3.0)
       mercenary (~> 0.3.3)
-      pygments.rb (~> 0.6.0)
+      pathutil (~> 0.9)
-      redcarpet (~> 3.1)
+      rouge (~> 1.7)
       safe_yaml (~> 1.0)
-      toml (~> 0.1.0)
+    jekyll-avatar (0.4.2)
+      jekyll (~> 3.0)
     jekyll-coffeescript (1.0.1)
       coffee-script (~> 2.2)
-    jekyll-gist (1.2.1)
+    jekyll-default-layout (0.1.4)
-    jekyll-mentions (0.2.1)
+      jekyll (~> 3.0)
-      html-pipeline (~> 1.9.0)
+    jekyll-feed (0.8.0)
-      jekyll (~> 2.0)
+      jekyll (~> 3.3)
+    jekyll-gist (1.4.0)
+      octokit (~> 4.2)
+    jekyll-github-metadata (2.3.1)
+      jekyll (~> 3.1)
+      octokit (~> 4.0, != 4.4.0)
+    jekyll-mentions (1.2.0)
+      activesupport (~> 4.0)
+      html-pipeline (~> 2.3)
+      jekyll (~> 3.0)
+    jekyll-optional-front-matter (0.1.2)
+      jekyll (~> 3.0)
     jekyll-paginate (1.1.0)
-    jekyll-redirect-from (0.6.2)
+    jekyll-readme-index (0.0.4)
-      jekyll (~> 2.0)
+      jekyll (~> 3.0)
-    jekyll-sass-converter (1.2.0)
+    jekyll-redirect-from (0.12.1)
-      sass (~> 3.2)
+      jekyll (~> 3.3)
-    jekyll-sitemap (0.6.3)
+    jekyll-relative-links (0.3.0)
-    jekyll-watch (1.2.1)
+      jekyll (~> 3.3)
-      listen (~> 2.7)
+    jekyll-sass-converter (1.5.0)
-    jemoji (0.4.0)
+      sass (~> 3.4)
-      gemoji (~> 2.0)
+    jekyll-seo-tag (2.1.0)
-      html-pipeline (~> 1.9)
+      jekyll (~> 3.3)
-      jekyll (~> 2.0)
+    jekyll-sitemap (0.12.0)
-    json (1.8.2)
+      jekyll (~> 3.3)
-    kramdown (1.5.0)
+    jekyll-swiss (0.4.0)
-    liquid (2.6.1)
+    jekyll-theme-architect (0.0.3)
-    listen (2.10.0)
+      jekyll (~> 3.3)
-      celluloid (~> 0.16.0)
+    jekyll-theme-cayman (0.0.3)
+      jekyll (~> 3.3)
+    jekyll-theme-dinky (0.0.3)
+      jekyll (~> 3.3)
+    jekyll-theme-hacker (0.0.3)
+      jekyll (~> 3.3)
+    jekyll-theme-leap-day (0.0.3)
+      jekyll (~> 3.3)
+    jekyll-theme-merlot (0.0.3)
+      jekyll (~> 3.3)
+    jekyll-theme-midnight (0.0.3)
+      jekyll (~> 3.3)
+    jekyll-theme-minimal (0.0.3)
+      jekyll (~> 3.3)
+    jekyll-theme-modernist (0.0.3)
+      jekyll (~> 3.3)
+    jekyll-theme-primer (0.1.7)
+      jekyll (~> 3.3)
+    jekyll-theme-slate (0.0.3)
+      jekyll (~> 3.3)
+    jekyll-theme-tactile (0.0.3)
+      jekyll (~> 3.3)
+    jekyll-theme-time-machine (0.0.3)
+      jekyll (~> 3.3)
+    jekyll-titles-from-headings (0.1.4)
+      jekyll (~> 3.3)
+    jekyll-watch (1.5.0)
+      listen (~> 3.0, < 3.1)
+    jemoji (0.8.0)
+      activesupport (~> 4.0)
+      gemoji (~> 3.0)
+      html-pipeline (~> 2.2)
+      jekyll (>= 3.0)
+    json (1.8.6)
+    kramdown (1.11.1)
+    liquid (3.0.6)
+    listen (3.0.6)
       rb-fsevent (>= 0.9.3)
-      rb-inotify (>= 0.9)
+      rb-inotify (>= 0.9.7)
-    maruku (0.7.0)
+    mercenary (0.3.6)
-    mercenary (0.3.5)
+    mini_portile2 (2.1.0)
-    mini_portile (0.6.2)
+    minima (2.0.0)
-    minitest (5.5.1)
+    minitest (5.10.1)
+    multipart-post (2.0.0)
     net-dns (0.8.0)
-    nokogiri (1.6.6.2)
+    nokogiri (1.6.8.1)
-      mini_portile (~> 0.6.0)
+      mini_portile2 (~> 2.1.0)
-    parslet (1.5.0)
+    octokit (4.6.2)
-      blankslate (~> 2.0)
+      sawyer (~> 0.8.0, >= 0.5.3)
-    posix-spawn (0.3.10)
+    pathutil (0.14.0)
-    public_suffix (1.5.0)
+      forwardable-extended (~> 2.6)
-    pygments.rb (0.6.1)
+    public_suffix (2.0.5)
-      posix-spawn (~> 0.3.6)
+    rb-fsevent (0.9.8)
-      yajl-ruby (~> 1.2.0)
+    rb-inotify (0.9.8)
-    rb-fsevent (0.9.4)
-    rb-inotify (0.9.5)
       ffi (>= 0.5.0)
-    rdiscount (2.1.7)
+    rouge (1.11.1)
-    redcarpet (3.1.2)
     safe_yaml (1.0.4)
-    sass (3.4.13)
+    sass (3.4.23)
-    terminal-table (1.4.5)
+    sawyer (0.8.1)
+      addressable (>= 2.3.5, < 2.6)
+      faraday (~> 0.8, < 1.0)
+    terminal-table (1.7.3)
+      unicode-display_width (~> 1.1.1)
     thread_safe (0.3.5)
-    timers (4.0.1)
+    typhoeus (0.8.0)
-      hitimes
+      ethon (>= 0.8.0)
-    toml (0.1.2)
-      parslet (~> 1.5.0)
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
-    yajl-ruby (1.2.1)
+    unicode-display_width (1.1.3)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   github-pages
+
+BUNDLED WITH
+   1.14.3

_config.yml

@@ -14,6 +14,7 @@ resume_name:                    "Homer J. Simpson"
 resume_title:                   "Nuclear Safety Inspector"
 resume_contact_email:
   "homerjsimpson@youremailaddress.com"
+resume_header_contact_info: "742 Evergreen Terrace, Springfield | 555-7334 | homerjsimpson@youremailaddress.com"
 
 # use "yes" to display the email contact button,
 # "no" to display an "I'm not looking for work" message,
@@ -41,6 +42,7 @@ resume_social_links:
   resume_linkedin_url:          "https://www.linkedin.com/in/joelglovier"
   # resume_instagram_url:         "insert your Instagram URL here"
   resume_website_url:           "http://joelglovier.com"
+resume_print_social_links:      true
 
 # Design settings
 resume_theme:                   default

_includes/head.html

@@ -7,7 +7,7 @@
 
   <!-- Google font typography settings - defined in _config.yml -->
   {% if site.resume_theme == 'default' %}
-  <link href='http://fonts.googleapis.com/css?family=Lora:400,700|Open+Sans:400,300,800,700' rel='stylesheet' type='text/css'>
+  <link href='https://fonts.googleapis.com/css?family=Lora:400,700|Open+Sans:400,300,800,700' rel='stylesheet' type='text/css'>
   {% endif %}
 
   <meta name="description" content="{% if page.excerpt %}{{ page.excerpt | strip_html | strip_newlines | truncate: 160 }}{% else %}{{ site.description }}{% endif %}">

_includes/print-social-links.html

@@ -0,0 +1,41 @@
+<!-- and guess where these are defined? Yup, you guessed it: the _config.yml file -->
+{% if site.resume_print_social_links %}
+<ul>
+
+  <!-- GitHub link -->
+  {% if site.resume_social_links.resume_github_url %}
+  <li><strong>Github</strong>: {{ site.resume_social_links.resume_github_url }}</li>
+  {% endif %}
+
+  <!-- Twitter link -->
+  {% if site.resume_social_links.resume_twitter_url %}
+  <li><strong>Twitter</strong>: {{ site.resume_social_links.resume_twitter_url }}</li>
+  {% endif %}
+
+  <!-- Dribbble link -->
+  {% if site.resume_social_links.resume_dribbble_url %}
+  <li><strong>Dribbble</strong>: {{ site.resume_social_links.resume_dribbble_url }}</li>
+  {% endif %}
+
+  <!-- Facebook link -->
+  {% if site.resume_social_links.resume_facebook_url %}
+  <li><strong>Facebook</strong>: {{ site.resume_social_links.resume_facebook_url }}</li>
+  {% endif %}
+
+  <!-- LinkedIn link -->
+  {% if site.resume_social_links.resume_linkedin_url %}
+  <li><strong>LinkedIn</strong>: {{ site.resume_social_links.resume_linkedin_url }}</li>
+  {% endif %}
+
+  <!-- Instagram link -->
+  {% if site.resume_social_links.resume_instagram_url %}
+  <li><strong>Instagram</strong>: {{ site.resume_social_links.resume_instagram_url }}</li>
+  {% endif %}
+
+  <!-- Website link -->
+  {% if site.resume_social_links.resume_website_url %}
+  <li><strong>Website</strong>: {{ site.resume_social_links.resume_website_url }}</li>
+  {% endif %}
+
+</ul>
+{% endif %}

_layouts/resume.html

@@ -11,13 +11,18 @@
 
         <!-- You can turn off the avatar in _config.yml by setting to false -->
         {% if site.resume_avatar == 'true' %}
-        <img src="images/avatar.jpg" alt="my photo" class="avatar" itemprop="image">
+        <img src="images/avatar.jpg" alt="my photo" class="avatar no-print" itemprop="image">
         {% endif %}
 
         <!-- Your name is defined in the _config.yml file -->
         <h1 class="header-name" itemprop="name">{{ site.resume_name }}</h1>
 
-        <div class="title-bar">
+        <!-- Contact buttons don't work in print, configure in the _config.yml file, remove "print-only" to display always. -->
+        <div class="header-contact-info print-only" itemprop="contact-info">
+          <p>{{ site.resume_header_contact_info }}</p>
+        </div>
+
+        <div class="title-bar no-print">
 
           <!-- Your title is also defined in the _config.yml file -->
           <h2 class="header-title" itemprop="jobTitle">{{ site.resume_title }}</h2>
@@ -26,14 +31,14 @@
           {% include icon-links.html %}
         </div>
 
-        <div class="executive-summary" itemprop="description">
+        <div class="executive-summary no-print" itemprop="description">
           <p>This is the executive summary. You should write a few brief, concise, and meaningful sentences about yourself from a professional context, and your immediate career goals. Make the length appropriate for your needs, but K.I.S.S.</p>
         </div>
 
         {% if site.resume_looking_for_work == 'yes' %}
-        <a href="mailto:{{ site.resume_contact_email }}" class="contact-button" itemprop="email">Contact me</a>
+        <a href="mailto:{{ site.resume_contact_email }}" class="contact-button no-print" itemprop="email">Contact me</a>
         {% elsif site.resume_looking_for_work == 'no' %}
-        <a class="contact-button not-looking">I'm not looking for work right now.</a>
+        <a class="contact-button not-looking no-print">I'm not looking for work right now.</a>
         {% else %}
         {% endif %}
 
@@ -66,6 +71,7 @@
         <header class="section-header">
           <h2>Education</h2>
         </header>
+
         {% for education in site.data.education %}
         <div class="resume-item" itemscope itemprop="worksFor" itemtype="http://schema.org/CollegeOrUniversity">
           <h3 class="resume-item-title" itemprop="name">{{ education.uni }}</h3>
@@ -151,7 +157,7 @@
           <p class="resume-item-copy">{{ association.summary }}</p>
         </div>
         {% endfor %}
-        
+
       </section>
       <!-- end Associations -->
       {% endif %}
@@ -176,6 +182,22 @@
       <!-- end Links -->
       {% endif %}
 
+      {% if site.resume_print_social_links %}
+      <!-- begin Print Social Links -->
+      <section class="content-section print-only">
+
+        <header class="section-header">
+          <h2>Social Links</h2>
+        </header>
+
+        <div class="resume-item">
+        {% include print-social-links.html %}
+        </div>
+
+      </section>
+      <!-- end Print Social Links -->
+      {% endif %}
+
       <footer class="page-footer">
         <p class="footer-line">Made by <a href="http://twitter.com/jglovier">@jglovier</a>. Fork me on <a href="https://github.com/jglovier/resume-template">GitHub</a>.</p>
         <p class="footer-line">If this is your live resume, you can modify or remove this part. ;-)</p>

_sass/_mixins.scss

@@ -94,4 +94,10 @@
   border-top: 4px solid #c7c7c7;
   border-bottom: 2px solid #c7c7c7;
   padding: .2rem 0 .4rem;
+}
+
+@mixin section_border_thin {
+  border-top: 1px solid #c7c7c7;
+  border-bottom: 1px solid #c7c7c7;
+  padding: .2rem 0 .2rem;
 }

_sass/_resume.scss

@@ -1,4 +1,4 @@
-// Resme styles
+// Resume styles
 // ---------------------------------------/
 
 // util
@@ -39,6 +39,14 @@
     margin: 1rem 0 2rem;
   }
 
+  .header-contact-info {
+    @include sans;
+    text-align: center;
+  }
+  .header-contact-info p a {
+    color: inherit;
+  }
+
   .title-bar {
     @include section_border;
     padding: .4rem 0;
@@ -176,3 +184,38 @@
     }
   }
 }
+
+.print-only { display: none !important }
+
+@media print {
+  .no-print { display: none !important }
+  .print-only { display: block !important }
+  body { font-size: 12px; line-height: 1rem; }
+  .page-header { padding: 1rem 0 .2rem;
+    .header-name {
+      @include sans_bold;
+      font-size: 2rem;
+      margin: 0 0 .2rem;
+    }
+  }
+  .section-header {
+    @include section_border_thin;
+    margin-bottom: 1rem;
+    h2 { font-size: 1.2rem; line-height: 1.5rem; }
+  }
+  .content-section {
+    margin: 0 0 1rem;
+    .resume-item { margin-bottom: 1rem; }
+    .resume-item-title {
+      font-size: 16px;
+      line-height: .7em;
+    }
+
+    .resume-item-details {
+      font-size: 12px;
+      margin: 0;
+      line-height: .7em;
+      font-style:italic;
+    }
+  }
+}