Skip to content

Commit 81bf0b1

Browse files
authored
Merge pull request #41 from sproogen/release/1.5.0
Release/1.5.0
2 parents 88c3ceb + ffe1855 commit 81bf0b1

File tree

12 files changed

+249
-212
lines changed

12 files changed

+249
-212
lines changed

Diff for: README.md

+18-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# modern-resume-theme [![Gem Version](https://badge.fury.io/rb/modern-resume-theme.svg)](https://badge.fury.io/rb/modern-resume-theme) [![Build Status](https://travis-ci.org/sproogen/modern-resume-theme.svg?branch=master)](https://travis-ci.org/sproogen/modern-resume-theme)
22

3-
*A modern simple static resume template and theme. Powered by Jekyll and GitHub pages.*
3+
*A modern simple static resume template and theme. Powered by Jekyll and GitHub pages.*
44
*Host your own resume on GitHub for **free!***
55

66
[View Demo](https://sproogen.github.io/modern-resume-theme/)
@@ -61,7 +61,7 @@ A list of all your education, each education will follow this format
6161
A list of all your experience, each experience will follow this format
6262
```
6363
- company: Company name
64-
link: Link to company (optional)
64+
link: Link to company (eg. https://google.com)(optional)
6565
job_title: Job title
6666
dates: Date Range (eg. November 2016 - present)
6767
quote: >
@@ -70,11 +70,26 @@ A list of all your experience, each experience will follow this format
7070
Description of role
7171
```
7272

73+
If you wish to specify multiple titles for a single company, use this format
74+
```
75+
- company: Company name
76+
link: Link to company (optional)
77+
jobs:
78+
- title: Job title 1
79+
dates: Date Range (eg. November 2016 - present)
80+
- title: Job title 2
81+
dates: Date Range (eg. January 2015 - November 2016)
82+
quote: >
83+
Short description of the company (optional)
84+
description: | # this will include new lines to allow paragraphs
85+
Description of role
86+
```
87+
7388
##### _data/projects.yml
7489
A list of all your projects, each project will follow this format
7590
```
7691
- name: Project name
77-
link: Link to project (eg. sproogen.github.io/modern-resume-theme)(optional)
92+
link: Link to project (eg. https://sproogen.github.io/modern-resume-theme)(optional)
7893
github: Github page for project (eg. sproogen/modern-resume-theme)(optional)
7994
quote: >
8095
Short overview of the project (optional)

Diff for: _config.yml

+2-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@ repository: Git repository where your resume will be hosted, only required if yo
66
name: Your Name
77
title: Your job title
88
email: Your email (optional)
9-
website: Your website (optional)
9+
phone: Your phone number (optional)
10+
website: Your website (eg. https://google.com)(optional)
1011

1112
# Social links
1213
twitter_username: jekyllrb

Diff for: _includes/a.html

+2
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
{% assign protocol = include.href | strip | slice: 0, 4 %}
2+
<a href="{% if protocol != 'http' %}//{% endif %}{{ include.href }}" target="_blank" class="{{ include.class }}">

Diff for: _includes/experience.html

+6-2
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,19 @@ <h3>{{ site.experience_title | default: "Experience" }}</h3>
55
<div class="col-xs-12 col-sm-4 col-md-3 col-print-12 left-column">
66
<h4 class="name">
77
{%- if experience.link -%}
8-
<a href="http://{{ experience.link }}" target="_blank">
8+
{% include a.html href=experience.link %}
99
{%- endif -%}
10-
{{ experience.company }}
10+
{{ experience.company }}
1111
{%- if experience.link -%}
1212
</a>
1313
{%- endif -%}
1414
</h4>
1515
<p><b>{{ experience.job_title }}</b></p>
1616
<p>{{ experience.dates }}</p>
17+
{% for job in experience.jobs %}
18+
<p><b>{{ job.title }}</b></p>
19+
<p>{{ job.dates }}</p>
20+
{% endfor %}
1721
</div>
1822
<div class="col-xs-12 col-sm-8 col-md-9 col-print-12">
1923
{%- if experience.quote -%}

Diff for: _includes/header.html

+6-1
Original file line numberDiff line numberDiff line change
@@ -90,9 +90,14 @@ <h2>{{ site.title | escape }}</h2>
9090
Email: <a href="mailto:{{ site.email }}" target="_blank">{{ site.email | escape }}</a>
9191
</p>
9292
{%- endif -%}
93+
{%- if site.phone -%}
94+
<p>
95+
Phone: {{ site.phone | escape }}
96+
</p>
97+
{%- endif -%}
9398
{%- if site.website -%}
9499
<p>
95-
Web: <a href="http://{{ site.website }}" target="_blank">{{ site.website | escape }}</a>
100+
Web: {% include a.html href=site.website %}{{ site.website | escape }}</a>
96101
</p>
97102
{%- endif -%}
98103
</div>

Diff for: _includes/projects.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ <h3>{{ site.projects_title | default: "Projects" }}</h3>
55
<div class="col-xs-12 col-sm-4 col-md-3 col-print-12 left-column">
66
<h4>{{ project.name }}</h4>
77
{%- if project.link -%}
8-
<a href="http://{{ project.link }}" target="_blank" class="project-link">{{ project.link }}</a>
8+
{% include a.html href=project.link class="project-link" %}{{ project.link }}</a>
99
{%- endif -%}
1010
<p class="no-print">
1111
<a href="https://github.com/{{ project.github }}" target="_blank">

Diff for: _sass/modern-resume-theme.scss

+201
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,201 @@
1+
@import "base";
2+
@import "button";
3+
@import "type";
4+
5+
ul.icons a:hover {
6+
background: rgba(0, 0, 0, 0.025);
7+
}
8+
9+
ul.icons li {
10+
display: inline-block;
11+
padding-left: 0.75em;
12+
}
13+
14+
ul.icons a {
15+
-moz-transition: background-color 0.25s ease-in-out;
16+
-webkit-transition: background-color 0.25s ease-in-out;
17+
-ms-transition: background-color 0.25s ease-in-out;
18+
transition: background-color 0.25s ease-in-out;
19+
display: inline-block;
20+
width: 2.75em;
21+
height: 2.75em;
22+
line-height: 2.8em;
23+
text-align: center;
24+
border: 0;
25+
box-shadow: none;
26+
padding:0;
27+
border-radius: 100%;
28+
color: #aaa;
29+
}
30+
31+
.icons i {
32+
font-size: 30px;
33+
line-height:60px;
34+
}
35+
36+
.icons {
37+
padding: 0;
38+
font-size: 1em;
39+
margin-bottom:20px;
40+
text-align: right;
41+
}
42+
43+
@media screen and (max-width: 768px) {
44+
.icons {
45+
text-align: center;
46+
}
47+
}
48+
49+
.header-right p {
50+
margin-bottom: 3px;
51+
}
52+
53+
.header-right a{
54+
color:inherit;
55+
font-weight:500;
56+
}
57+
58+
@media screen and (max-width: 768px) {
59+
.header-contianer div{
60+
text-align: center;
61+
}
62+
63+
.header-right p {
64+
text-align: center;
65+
}
66+
67+
.header-left {
68+
margin-top: 0px;
69+
}
70+
}
71+
72+
.profile-img {
73+
width: 200px;
74+
height: 200px;
75+
margin: 0 auto;
76+
margin-bottom: 20px;
77+
display: block;
78+
border-radius: 100px;
79+
background-size: cover;
80+
background-position: center;
81+
background-repeat: repeat, no-repeat;
82+
-moz-box-shadow: inset 0 0 20px #636161;
83+
-webkit-box-shadow: inset 0 0 20px #636161;
84+
box-shadow: inset 0 0 20px #636161;
85+
}
86+
87+
.into-text-1 {
88+
margin-top: 30px;
89+
}
90+
91+
@media only screen and (max-width : 992px) {
92+
.into-text-1 {
93+
margin-top: 20px;
94+
}
95+
}
96+
97+
.projects-container, .experience-container, .education-container {
98+
h3 {
99+
margin-bottom: 0;
100+
}
101+
}
102+
103+
.experience, .education, .project {
104+
margin-top: 3em;
105+
106+
.left-column {
107+
text-align: left;
108+
109+
p {
110+
margin-bottom: 3px;
111+
font-size: 1.6em;
112+
text-align: inherit;
113+
font-weight: 300;
114+
115+
b {
116+
font-weight: 500;
117+
}
118+
}
119+
120+
@media screen and (max-width: 768px) {
121+
text-align: center;
122+
123+
p {
124+
text-align: center;
125+
}
126+
}
127+
128+
a {
129+
color: inherit;
130+
font-style: italic;
131+
font-weight: 300;
132+
}
133+
134+
.fa {
135+
font-size: 2em;
136+
}
137+
138+
.project-link {
139+
font-size: 1.5em;
140+
}
141+
142+
h4 {
143+
margin-bottom: 0.4em;
144+
font-weight: 500;
145+
146+
@media print {
147+
margin-bottom: 0.2em;
148+
}
149+
150+
a {
151+
font-weight: 500;
152+
}
153+
}
154+
}
155+
}
156+
157+
.footer-container {
158+
margin-top:100px;
159+
}
160+
161+
.footer-container p{
162+
text-align: center;
163+
font-style: italic;
164+
font-weight: 300;
165+
}
166+
167+
.footer-container a{
168+
color: inherit;
169+
font-style: italic;
170+
font-weight: 300;
171+
}
172+
173+
.page-content {
174+
padding: 0;
175+
}
176+
177+
.contact a {
178+
line-height: 50px;
179+
margin-left: 30px;
180+
color: #BBBBBB;
181+
-webkit-transition: color 0.4s ease;
182+
-moz-transition: color 0.4s ease;
183+
transition: color 0.4s ease;
184+
}
185+
186+
.contact a:hover {
187+
color: #4C4C4C;
188+
}
189+
190+
p.quote {
191+
font-size: 1.4em;
192+
font-style: italic;
193+
padding: 1em 2.5em;
194+
text-align: center;
195+
196+
@media print {
197+
text-align: left;
198+
padding: 0em 1em;
199+
margin-top: 1em;
200+
}
201+
}

Diff for: _test/_config.yml

+1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ repository: sproogen/modern-resume-theme
66
name: Your Name
77
title: Your job title
88
9+
phone: 07845248563
910
website: sproogen.github.io/modern-resume-theme
1011

1112
# Social links

Diff for: _test/_data/experience.yml

+9-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
- company: Company 1
2-
link: google.com
2+
link: https://google.com
33
job_title: Job title 1
44
dates: November 2016 - present
55
quote: >
@@ -13,3 +13,11 @@
1313
description: >
1414
Description of role
1515
16+
- company: Company 3
17+
jobs:
18+
- title: Job title 1
19+
dates: February 2013 - December 2013
20+
- title: Job title 2
21+
dates: June 2012 - February 2013
22+
description: >
23+
Description of role

Diff for: _test/_data/projects.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Project template
22
- name: Project 1
3-
link: sproogen.github.io/modern-resume-theme
3+
link: https://sproogen.github.io/modern-resume-theme
44
github: sproogen/modern-resume-theme
55
quote: >
66
Short overview of the project

0 commit comments

Comments
 (0)