modern-resume-theme 1.5.3 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 362be4880dcc36833ce6617e9a184870c9f80725
-  data.tar.gz: c7b47f176c11be8a9fda1e958717f00793c10511
+  metadata.gz: 143eed304942f78b0f297c0ef19cfdf3f4e9c00f
+  data.tar.gz: 9b9cb75b40c208afc0b0658fb07c0aa8ae2ffaae
 SHA512:
-  metadata.gz: 5b7e15671a15a0af0f6156c3c906a2c8085c596f20425552980659a7386c3797b300c452561d30594164a4d8af79da5545b8efd1fd467cb7c79064f3b4cfde58
-  data.tar.gz: d6d1701f25c92bb475b6b94d712e59f6398015c672554e524aad092898b8cfdc73daf50d00205813e9e5868176eed233e243d24d4554243e3bc95da0e9d97615
+  metadata.gz: 27130bde0dd859c57740a211c5dfe0a5eb4aa2d299fd8908ac820330b88456ca437c73b52a269efb626d9346249740188fd6b78a5569b468fe517904b2c744ac
+  data.tar.gz: bc5062db703fd47a893bb9f1a0e5021b276cc1fddd422b81f710c11d08e9d257f8786f8ac2953180b99171657291e5b61dfbe2e17e4ad8576d1f06a79740a5ff

data/README.md

@@ -11,8 +11,6 @@
 
 *I always enjoy seeing how people are using my creations and if you would like to say thanks feel free to [buy me a coffee (buymeacoffee.com/vJ6HfLu)](https://buymeacoff.ee/vJ6HfLu).*
 
-[![Buy me a coffee](https://www.buymeacoffee.com/assets/img/custom_images/orange_img.png)](https://www.buymeacoffee.com/vJ6HfLu)
-
 *If you would like to see how I am using this then you can view my resume [here (jameswgrant.co.uk)](http://www.jameswgrant.co.uk/) and find the code [here (sproogen/jameswgrant)](https://github.com/sproogen/jameswgrant), hopefully this might help you.*
 
 You can view the project [roadmap here](https://github.com/sproogen/modern-resume-theme/projects/1).
@@ -52,7 +50,8 @@ A full example of the _config.yml can be found [here](https://github.com/sprooge
 ##### _data/education.yml
 A list of all your education, each education will follow this format
 ```
-- name: Institution name
+- layout: left (options: left, right, top, top-right, top-middle)
+  name: Institution name
   dates: Date Range (eg. 2016 - 2019)
   qualification: Qualifications (eg. BA Performing Arts)
   quote: >
@@ -64,7 +63,8 @@ A list of all your education, each education will follow this format
 ##### _data/experience.yml
 A list of all your experience, each experience will follow this format
 ```
-- company: Company name
+- layout: left (options: left, right, top, top-right, top-middle)
+  company: Company name
   link: Link to company (eg. https://google.com)(optional)
   job_title: Job title
   dates: Date Range (eg. November 2016 - present)
@@ -74,9 +74,10 @@ A list of all your experience, each experience will follow this format
     Description of role
 ```
 
-If you wish to specify multiple titles for a single company, use this format
+If you wish to specify multiple job titles for a single company, use this format
 ```
-- company: Company name
+- layout: left (options: left, right, top, top-right, top-middle)
+  company: Company name
   link: Link to company (optional)
   jobs:
     - title: Job title 1
@@ -92,7 +93,8 @@ If you wish to specify multiple titles for a single company, use this format
 ##### _data/projects.yml
 A list of all your projects, each project will follow this format
 ```
-- name: Project name
+- layout: left (options: left, right, top, top-right, top-middle)
+  name: Project name
   link: Link to project (eg. https://sproogen.github.io/modern-resume-theme)(optional)
   github: Github page for project (eg. sproogen/modern-resume-theme)(optional)
   quote: >
@@ -101,6 +103,9 @@ A list of all your projects, each project will follow this format
     Description about the work on/with the project
 ```
 
+##### assets/main.scss
+Add any css changes or additions you want to make here after the line `@import 'modern-resume-theme';`
+
 ## Running locally
 
 Before you start make sure you have *Ruby* and the gems for *Jekyll* installed locally. You can find out how to do that [here](https://jekyllrb.com/docs/installation/).
@@ -122,8 +127,12 @@ This project is intended to be a safe, welcoming space for collaboration, and co
 
 ## Development
 
+### Locally
+
 Before you start make sure you have *Ruby* and the gems for *Jekyll* installed locally. You can find out how to do that [here](https://jekyllrb.com/docs/installation/).
 
+*Note: You will need version `1.15.2` of bundler, as this is the only version that Heroku supports.*
+
 1. Fork and or clone this repository locally
 2. `cd modern-resume-theme`
 3. `bundle install`
@@ -134,6 +143,10 @@ Any changes you make will automatically build and you will be able to see these
 
 *Note: You will need to re-run `bundle exec jekyll serve` to see changes made in `_config.yml`.*
 
+### Docker
+
+If you have docker installed you can simply run `docker-compose up` to launch the site in a container, it will then be hosted at `http://localhost:4000`
+
 ## License
 
 The theme is available as open source under the terms of the [MIT License](https://opensource.org/licenses/MIT).

data/_includes/education.html

@@ -1,18 +1,6 @@
 <div class="container education-container">
   <h3>{{ site.education_title | default: "Education" }}</h3>
   {% for education in site.data.education %}
-    <div class="row clearfix education">
-      <div class="col-xs-12 col-sm-4 col-md-3 col-print-12 left-column">
-        <h4>{{ education.name }}</h4>
-        <p><b>{{ education.qualification }}</b></p>
-        <p>{{ education.dates }}</p>
-      </div>
-      <div class="col-xs-12 col-sm-8 col-md-9 col-print-12">
-        {%- if education.quote -%}
-          <p class="quote">{{ education.quote }}</p>
-        {%- endif -%}
-        {{ education.description | strip | markdownify }}
-      </div>
-    </div>
+    {% include {{ education.layout | default: 'left' | append: ".html" }} item=education %}
   {% endfor %}
 </div>

data/_includes/experience.html

@@ -1,30 +1,6 @@
 <div class="container experience-container">
   <h3>{{ site.experience_title | default: "Experience" }}</h3>
   {% for experience in site.data.experience %}
-    <div class="row clearfix experience">
-      <div class="col-xs-12 col-sm-4 col-md-3 col-print-12 left-column">
-        <h4 class="name">
-          {%- if experience.link -%}
-            {% include a.html href=experience.link %}
-          {%- endif -%}
-          {{ experience.company }}
-          {%- if experience.link -%}
-            </a>
-          {%- endif -%}
-          </h4>
-        <p><b>{{ experience.job_title }}</b></p>
-        <p>{{ experience.dates }}</p>
-        {% for job in experience.jobs %}
-          <p><b>{{ job.title }}</b></p>
-          <p>{{ job.dates }}</p>
-        {% endfor %}
-      </div>
-      <div class="col-xs-12 col-sm-8 col-md-9 col-print-12">
-        {%- if experience.quote -%}
-          <p class="quote">{{ experience.quote }}</p>
-        {%- endif -%}
-        {{ experience.description | strip | markdownify }}
-      </div>
-    </div>
+    {% include {{ experience.layout | default: 'left' | append: ".html" }} item=experience %}
   {% endfor %}
 </div>

data/_includes/left.html

@@ -0,0 +1,29 @@
+<div class="row clearfix layout layout-left">
+  <div class="col-xs-12 col-sm-4 col-md-3 col-print-12 details">
+    {%- if include.item.name -%}<h4>{{ include.item.name }}</h4>{%- endif -%}
+    {%- if include.item.company -%}<h4>{{ include.item.company }}</h4>{%- endif -%}
+    {%- if include.item.link -%}
+      {% include a.html href=include.item.link class="link" %}{{ include.item.link }}</a>
+    {%- endif -%}
+    {%- if include.item.job_title -%}<p><b>{{ include.item.job_title }}</b></p>{%- endif -%}
+    {%- if include.item.qualification -%}<p><b>{{ include.item.qualification }}</b></p>{%- endif -%}
+    {%- if include.item.dates -%}<p>{{ include.item.dates }}</p>{%- endif -%}
+    {% for job in include.item.jobs %}
+      <p><b>{{ job.title }}</b></p>
+      <p>{{ job.dates }}</p>
+    {% endfor %}
+    {%- if include.item.github -%}
+      <p class="no-print">
+        <a href="https://github.com/{{ include.item.github }}" target="_blank">
+          <i class="fa fa-github" title="{{ include.item.name }} Github link"></i>
+        </a>
+      </p>
+    {%- endif -%}
+  </div>
+  <div class="col-xs-12 col-sm-8 col-md-9 col-print-12">
+    {%- if include.item.quote -%}
+      <p class="quote">{{ include.item.quote }}</p>
+    {%- endif -%}
+    {{ include.item.description | strip | markdownify }}
+  </div>
+</div>

data/_includes/projects.html

@@ -1,24 +1,6 @@
 <div class="container projects-container">
   <h3>{{ site.projects_title | default: "Projects" }}</h3>
   {% for project in site.data.projects %}
-    <div class="row clearfix project">
-      <div class="col-xs-12 col-sm-4 col-md-3 col-print-12 left-column">
-        <h4>{{ project.name }}</h4>
-        {%- if project.link -%}
-          {% include a.html href=project.link class="project-link" %}{{ project.link }}</a>
-        {%- endif -%}
-        <p class="no-print">
-          <a href="https://github.com/{{ project.github }}" target="_blank">
-            <i class="fa fa-github" title="{{ project.name }} Github link"></i>
-          </a>
-        </p>
-      </div>
-      <div class="col-xs-12 col-sm-8 col-md-9 col-print-12">
-        {%- if project.quote -%}
-          <p class="quote">{{ project.quote }}</p>
-        {%- endif -%}
-        {{ project.description | strip | markdownify }}
-      </div>
-    </div>
+    {% include {{ project.layout | default: 'left' | append: ".html" }} item=project %}
   {% endfor %}
 </div>

data/_includes/right.html

@@ -0,0 +1,29 @@
+<div class="row clearfix layout layout-right">
+  <div class="col-xs-12 col-sm-8 col-md-9 col-print-12">
+    {%- if include.item.quote -%}
+      <p class="quote">{{ include.item.quote }}</p>
+    {%- endif -%}
+    {{ include.item.description | strip | markdownify }}
+  </div>
+  <div class="col-xs-12 col-sm-4 col-md-3 col-print-12 details">
+    {%- if include.item.name -%}<h4>{{ include.item.name }}</h4>{%- endif -%}
+    {%- if include.item.company -%}<h4>{{ include.item.company }}</h4>{%- endif -%}
+    {%- if include.item.link -%}
+    {% include a.html href=include.item.link class="link" %}{{ include.item.link }}</a>
+    {%- endif -%}
+    {%- if include.item.job_title -%}<p><b>{{ include.item.job_title }}</b></p>{%- endif -%}
+    {%- if include.item.qualification -%}<p><b>{{ include.item.qualification }}</b></p>{%- endif -%}
+    {%- if include.item.dates -%}<p>{{ include.item.dates }}</p>{%- endif -%}
+    {% for job in include.item.jobs %}
+    <p><b>{{ job.title }}</b></p>
+    <p>{{ job.dates }}</p>
+    {% endfor %}
+    {%- if include.item.github -%}
+    <p class="no-print">
+      <a href="https://github.com/{{ include.item.github }}" target="_blank">
+        <i class="fa fa-github" title="{{ include.item.name }} Github link"></i>
+      </a>
+    </p>
+    {%- endif -%}
+  </div>
+</div>

data/_includes/top-middle.html

@@ -0,0 +1,29 @@
+<div class="row clearfix layout layout-top-middle">
+  <div class="col-xs-12 col-print-12 details">
+    {%- if include.item.name -%}<h4>{{ include.item.name }}</h4>{%- endif -%}
+    {%- if include.item.company -%}<h4>{{ include.item.company }}</h4>{%- endif -%}
+    {%- if include.item.link -%}
+      {% include a.html href=include.item.link class="link" %}{{ include.item.link }}</a>
+    {%- endif -%}
+    {%- if include.item.job_title -%}<p><b>{{ include.item.job_title }}</b></p>{%- endif -%}
+    {%- if include.item.qualification -%}<p><b>{{ include.item.qualification }}</b></p>{%- endif -%}
+    {%- if include.item.dates -%}<p>{{ include.item.dates }}</p>{%- endif -%}
+    {% for job in include.item.jobs %}
+      <p><b>{{ job.title }}</b></p>
+      <p>{{ job.dates }}</p>
+    {% endfor %}
+    {%- if include.item.github -%}
+      <p class="no-print">
+        <a href="https://github.com/{{ include.item.github }}" target="_blank">
+          <i class="fa fa-github" title="{{ include.item.name }} Github link"></i>
+        </a>
+      </p>
+    {%- endif -%}
+  </div>
+  <div class="col-xs-12 col-print-12">
+    {%- if include.item.quote -%}
+      <p class="quote">{{ include.item.quote }}</p>
+    {%- endif -%}
+    {{ include.item.description | strip | markdownify }}
+  </div>
+</div>

data/_includes/top-right.html

@@ -0,0 +1,29 @@
+<div class="row clearfix layout layout-top-right">
+  <div class="col-xs-12 col-print-12 details">
+    {%- if include.item.name -%}<h4>{{ include.item.name }}</h4>{%- endif -%}
+    {%- if include.item.company -%}<h4>{{ include.item.company }}</h4>{%- endif -%}
+    {%- if include.item.link -%}
+      {% include a.html href=include.item.link class="link" %}{{ include.item.link }}</a>
+    {%- endif -%}
+    {%- if include.item.job_title -%}<p><b>{{ include.item.job_title }}</b></p>{%- endif -%}
+    {%- if include.item.qualification -%}<p><b>{{ include.item.qualification }}</b></p>{%- endif -%}
+    {%- if include.item.dates -%}<p>{{ include.item.dates }}</p>{%- endif -%}
+    {% for job in include.item.jobs %}
+      <p><b>{{ job.title }}</b></p>
+      <p>{{ job.dates }}</p>
+    {% endfor %}
+    {%- if include.item.github -%}
+      <p class="no-print">
+        <a href="https://github.com/{{ include.item.github }}" target="_blank">
+          <i class="fa fa-github" title="{{ include.item.name }} Github link"></i>
+        </a>
+      </p>
+    {%- endif -%}
+  </div>
+  <div class="col-xs-12 col-print-12">
+    {%- if include.item.quote -%}
+      <p class="quote">{{ include.item.quote }}</p>
+    {%- endif -%}
+    {{ include.item.description | strip | markdownify }}
+  </div>
+</div>

data/_includes/top.html

@@ -0,0 +1,29 @@
+<div class="row clearfix layout layout-top">
+  <div class="col-xs-12 col-print-12 details">
+    {%- if include.item.name -%}<h4>{{ include.item.name }}</h4>{%- endif -%}
+    {%- if include.item.company -%}<h4>{{ include.item.company }}</h4>{%- endif -%}
+    {%- if include.item.link -%}
+      {% include a.html href=include.item.link class="link" %}{{ include.item.link }}</a>
+    {%- endif -%}
+    {%- if include.item.job_title -%}<p><b>{{ include.item.job_title }}</b></p>{%- endif -%}
+    {%- if include.item.qualification -%}<p><b>{{ include.item.qualification }}</b></p>{%- endif -%}
+    {%- if include.item.dates -%}<p>{{ include.item.dates }}</p>{%- endif -%}
+    {% for job in include.item.jobs %}
+      <p><b>{{ job.title }}</b></p>
+      <p>{{ job.dates }}</p>
+    {% endfor %}
+    {%- if include.item.github -%}
+      <p class="no-print">
+        <a href="https://github.com/{{ include.item.github }}" target="_blank">
+          <i class="fa fa-github" title="{{ include.item.name }} Github link"></i>
+        </a>
+      </p>
+    {%- endif -%}
+  </div>
+  <div class="col-xs-12 col-print-12">
+    {%- if include.item.quote -%}
+      <p class="quote">{{ include.item.quote }}</p>
+    {%- endif -%}
+    {{ include.item.description | strip | markdownify }}
+  </div>
+</div>

data/_sass/modern-resume-theme.scss

@@ -100,10 +100,10 @@ ul.icons a {
   }
 }
 
-.experience, .education, .project {
+.layout {
   margin-top: 3em;
 
-  .left-column {
+  .details {
     text-align: left;
 
     p {
@@ -135,12 +135,12 @@ ul.icons a {
       font-size: 2em;
     }
 
-    .project-link {
+    .link {
       font-size: 1.5em;
     }
 
     h4 {
-      margin-bottom: 0.4em;
+      margin-bottom: 0.1em;
       font-weight: 500;
 
       @media print {
@@ -154,6 +154,18 @@ ul.icons a {
   }
 }
 
+.layout-right, .layout-top-right {
+  .details {
+    text-align: right;
+  }
+}
+
+.layout-top-middle {
+  .details {
+    text-align: center;
+  }
+}
+
 .footer-container {
   margin-top:100px;
 }

data/assets/main.scss

@@ -2,4 +2,4 @@
 # Front matter comment to ensure Jekyll properly reads file.
 ---
 
-@import 'modern-resume-theme'
+@import 'modern-resume-theme';

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: modern-resume-theme
 version: !ruby/object:Gem::Version
-  version: 1.5.3
+  version: 1.6.0
 platform: ruby
 authors:
 - James Grant
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-21 00:00:00.000000000 Z
+date: 2019-05-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: github-pages
@@ -38,20 +38,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.1'
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 2.0.1
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 2.0.1
 - !ruby/object:Gem::Dependency
   name: html-proofer
   requirement: !ruby/object:Gem::Requirement
@@ -83,8 +69,13 @@ files:
 - _includes/google-analytics.html
 - _includes/head.html
 - _includes/header.html
+- _includes/left.html
 - _includes/more.html
 - _includes/projects.html
+- _includes/right.html
+- _includes/top-middle.html
+- _includes/top-right.html
+- _includes/top.html
 - _layouts/default.html
 - _sass/base.scss
 - _sass/button.scss