Skip to content

Commit 0637ce6

Browse files
sproogensproogen
authored
Merge pull request #32 from sproogen/release/1.3
Release/1.3
2 parents 5693673 + 5683c17 commit 0637ce6

File tree

10 files changed

+114
-28
lines changed

10 files changed

+114
-28
lines changed

Diff for: ‎_includes/about.html

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22
<h3>{{ site.about_title | default: "About Me" }}</h3>
33
<div class="row clearfix">
44
{%- if site.about_profile_image -%}
5-
<div class="col-xs-12 col-sm-4 col-md-3">
5+
<div class="col-xs-12 col-sm-4 col-md-3 no-print">
66
<span class="profile-img" style="background-image: url({{ site.about_profile_image | relative_url }})" />
77
</div>
88
{%- endif -%}
9-
<div class="{{ 'col-xs-12 ' }}{%- if site.about_profile_image -%}col-sm-8 col-md-9{%- endif -%}">
9+
<div class="{{ 'col-xs-12 ' }}{%- if site.about_profile_image -%}col-sm-8 col-md-9 col-print-12{%- endif -%}">
1010
{{ site.about_content | strip | markdownify }}
1111
</div>
1212
</div>

Diff for: ‎_includes/education.html

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@
22
<h3>{{ site.education_title | default: "Education" }}</h3>
33
{% for education in site.data.education %}
44
<div class="row clearfix education">
5-
<div class="col-xs-12 col-sm-4 col-md-3 left-column">
5+
<div class="col-xs-12 col-sm-4 col-md-3 col-print-12 left-column">
66
<h4>{{ education.name }}</h4>
77
<p><b>{{ education.qualification }}</b></p>
88
<p>{{ education.dates }}</p>
99
</div>
10-
<div class="col-xs-12 col-sm-8 col-md-9">
10+
<div class="col-xs-12 col-sm-8 col-md-9 col-print-12">
1111
{%- if education.quote -%}
1212
<p class="quote">{{ education.quote }}</p>
1313
{%- endif -%}

Diff for: ‎_includes/experience.html

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<h3>{{ site.experience_title | default: "Experience" }}</h3>
33
{% for experience in site.data.experience %}
44
<div class="row clearfix experience">
5-
<div class="col-xs-12 col-sm-4 col-md-3 left-column">
5+
<div class="col-xs-12 col-sm-4 col-md-3 col-print-12 left-column">
66
<h4 class="name">
77
{%- if experience.link -%}
88
<a href="http://{{ experience.link }}" target="_blank">
@@ -15,7 +15,7 @@ <h4 class="name">
1515
<p><b>{{ experience.job_title }}</b></p>
1616
<p>{{ experience.dates }}</p>
1717
</div>
18-
<div class="col-xs-12 col-sm-8 col-md-9">
18+
<div class="col-xs-12 col-sm-8 col-md-9 col-print-12">
1919
{%- if experience.quote -%}
2020
<p class="quote">{{ experience.quote }}</p>
2121
{%- endif -%}

Diff for: ‎_includes/header.html

+11-11
Original file line numberDiff line numberDiff line change
@@ -5,74 +5,74 @@ <h1>{{ site.name | escape }}</h1>
55
<h2>{{ site.title | escape }}</h2>
66
</div>
77
<div class="col-xs-12 col-sm-6 col-md-6 col-lg-4 header-right">
8-
<ul class="icons">
8+
<ul class="icons no-print">
99
{%- if site.dribbble_username -%}
1010
<li>
1111
<a target="_blank" href="https://dribbble.com/{{ site.dribbble_username| cgi_escape | escape }}" class="button button--sacnite button--round-l">
12-
<i class="fa fa-dribbble"></i>
12+
<i class="fa fa-dribbble" title="Dribble link"></i>
1313
</a>
1414
</li>
1515
{%- endif -%}
1616
{%- if site.facebook_username -%}
1717
<li>
1818
<a target="_blank" href="https://www.facebook.com/{{ site.facebook_username| cgi_escape | escape }}" class="button button--sacnite button--round-l">
19-
<i class="fa fa-facebook"></i>
19+
<i class="fa fa-facebook" title="Facebook link"></i>
2020
</a>
2121
</li>
2222
{%- endif -%}
2323
{%- if site.flickr_username -%}
2424
<li>
2525
<a target="_blank" href="https://www.flickr.com/photos/{{ site.flickr_username| cgi_escape | escape }}" class="button button--sacnite button--round-l">
26-
<i class="fa fa-flickr"></i>
26+
<i class="fa fa-flickr" title="Flickr link"></i>
2727
</a>
2828
</li>
2929
{%- endif -%}
3030
{%- if site.github_username -%}
3131
<li>
3232
<a target="_blank" href="https://github.com/{{ site.github_username| cgi_escape | escape }}" class="button button--sacnite button--round-l">
33-
<i class="fa fa-github"></i>
33+
<i class="fa fa-github" title="Github link"></i>
3434
</a>
3535
</li>
3636
{%- endif -%}
3737
{%- if site.instagram_username -%}
3838
<li>
3939
<a target="_blank" href="https://www.instagram.com/{{ site.instagram_username| cgi_escape | escape }}" class="button button--sacnite button--round-l">
40-
<i class="fa fa-instagram"></i>
40+
<i class="fa fa-instagram" title="Instagram link"></i>
4141
</a>
4242
</li>
4343
{%- endif -%}
4444
{%- if site.linkedin_username -%}
4545
<li>
4646
<a target="_blank" href="https://www.linkedin.com/in/{{ site.linkedin_username| cgi_escape | escape }}" class="button button--sacnite button--round-l">
47-
<i class="fa fa-linkedin"></i>
47+
<i class="fa fa-linkedin" title="Linkedin link"></i>
4848
</a>
4949
</li>
5050
{%- endif -%}
5151
{%- if site.pinterest_username -%}
5252
<li>
5353
<a target="_blank" href="https://www.pinterest.com/{{ site.pinterest_username| cgi_escape | escape }}" class="button button--sacnite button--round-l">
54-
<i class="fa fa-pinterest"></i>
54+
<i class="fa fa-pinterest" title="Pintrest link"></i>
5555
</a>
5656
</li>
5757
{%- endif -%}
5858
{%- if site.twitter_username -%}
5959
<li>
6060
<a target="_blank" href="https://twitter.com/{{ site.twitter_username| cgi_escape | escape }}" class="button button--sacnite button--round-l">
61-
<i class="fa fa-twitter"></i>
61+
<i class="fa fa-twitter" title="Twitter link"></i>
6262
</a>
6363
</li>
6464
{%- endif -%}
6565
{%- if site.youtube_username -%}
6666
<li>
6767
<a target="_blank" href="https://www.youtube.com/{{ site.youtube_username| cgi_escape | escape }}" class="button button--sacnite button--round-l">
68-
<i class="fa fa-youtube-play"></i>
68+
<i class="fa fa-youtube-play" title="Youtube link"></i>
6969
</a>
7070
</li>
7171
{%- endif -%}
7272
{%- if site.googleplus_username -%}
7373
<li>
7474
<a target="_blank" href="https://plus.google.com/{{ site.googleplus_username| escape }}" class="button button--sacnite button--round-l">
75-
<i class="fa fa-google-plus"></i>
75+
<i class="fa fa-google-plus" title="Google plus link"></i>
7676
</a>
7777
</li>
7878
{%- endif -%}

Diff for: ‎_includes/projects.html

+4-4
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,18 @@
22
<h3>{{ site.projects_title | default: "Projects" }}</h3>
33
{% for project in site.data.projects %}
44
<div class="row clearfix project">
5-
<div class="col-xs-12 col-sm-4 col-md-3 left-column">
5+
<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 -%}
88
<a href="http://{{ project.link }}" target="_blank" class="project-link">{{ project.link }}</a>
99
{%- endif -%}
10-
<p>
10+
<p class="no-print">
1111
<a href="https://github.com/{{ project.github }}" target="_blank">
12-
<i class="fa fa-github"></i>
12+
<i class="fa fa-github" title="{{ project.name }} Github link"></i>
1313
</a>
1414
</p>
1515
</div>
16-
<div class="col-xs-12 col-sm-8 col-md-9">
16+
<div class="col-xs-12 col-sm-8 col-md-9 col-print-12">
1717
{%- if project.quote -%}
1818
<p class="quote">{{ project.quote }}</p>
1919
{%- endif -%}

Diff for: ‎_layouts/default.html

+3-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,9 @@
2424
{%- include education.html -%}
2525
{%- endif -%}
2626

27-
{%- include more.html -%}
27+
{%- if site.more_content -%}
28+
{%- include more.html -%}
29+
{%- endif -%}
2830

2931
</div>
3032
</main>

Diff for: ‎_sass/base.scss

+66
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,12 @@ body {
155155

156156
.container {
157157
margin-top:30px;
158+
159+
@media print {
160+
margin-top: 20px;
161+
}
158162
}
163+
159164
.header-contianer {
160165
margin-top:50px;
161166
}
@@ -166,9 +171,70 @@ body {
166171

167172
.header-left {
168173
margin-top: 30px;
174+
175+
@media print {
176+
margin-top: 0px;
177+
}
169178
}
170179

171180
.header-right p {
172181
font-size: 1.6em;
173182
text-align: right;
174183
}
184+
185+
@media print {
186+
a[href]:after {
187+
content: none !important;
188+
}
189+
190+
img[src]:after {
191+
content: none !important;
192+
}
193+
194+
.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 {
195+
float: left;
196+
}
197+
.col-sm-12 {
198+
width: 100%;
199+
}
200+
.col-sm-11 {
201+
width: 91.66666667%;
202+
}
203+
.col-sm-10 {
204+
width: 83.33333333%;
205+
}
206+
.col-sm-9 {
207+
width: 75%;
208+
}
209+
.col-sm-8 {
210+
width: 66.66666667%;
211+
}
212+
.col-sm-7 {
213+
width: 58.33333333%;
214+
}
215+
.col-sm-6 {
216+
width: 50%;
217+
}
218+
.col-sm-5 {
219+
width: 41.66666667%;
220+
}
221+
.col-sm-4 {
222+
width: 33.33333333%;
223+
}
224+
.col-sm-3 {
225+
width: 25%;
226+
}
227+
.col-sm-2 {
228+
width: 16.66666667%;
229+
}
230+
.col-sm-1 {
231+
width:8.33333333%;
232+
}
233+
.col-print-12 {
234+
width: 100%;
235+
}
236+
237+
.no-print, .no-print * {
238+
display: none !important;
239+
}
240+
}

Diff for: ‎_sass/type.scss

+8
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,10 @@ body {
44
font-feature-settings: "kern", "liga", "pnum";
55
font-size: 1em;
66
line-height: 1.5;
7+
8+
@media print {
9+
font-size: 0.9em;
10+
}
711
}
812

913
h1,
@@ -49,6 +53,10 @@ h3 {
4953
border-bottom: dashed 2px #CCCCCC;
5054
padding-bottom: 10px;
5155
margin-bottom:40px;
56+
57+
@media print {
58+
margin-bottom: 20px;
59+
}
5260
}
5361

5462
h4 {

Diff for: ‎assets/main.scss

+15-5
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ ul.icons a {
4444
text-align: right;
4545
}
4646

47-
@media (max-width: 768px) {
47+
@media screen and (max-width: 768px) {
4848
.icons {
4949
text-align: center;
5050
}
@@ -59,7 +59,7 @@ ul.icons a {
5959
font-weight:500;
6060
}
6161

62-
@media (max-width: 768px) {
62+
@media screen and (max-width: 768px) {
6363
.header-contianer div{
6464
text-align: center;
6565
}
@@ -89,12 +89,12 @@ ul.icons a {
8989
}
9090

9191
.into-text-1 {
92-
margin-top:30px;
92+
margin-top: 30px;
9393
}
9494

9595
@media only screen and (max-width : 992px) {
9696
.into-text-1 {
97-
margin-top:20px;
97+
margin-top: 20px;
9898
}
9999
}
100100

@@ -121,7 +121,7 @@ ul.icons a {
121121
}
122122
}
123123

124-
@media (max-width: 768px) {
124+
@media screen and (max-width: 768px) {
125125
text-align: center;
126126

127127
p {
@@ -147,6 +147,10 @@ ul.icons a {
147147
margin-bottom: 0.4em;
148148
font-weight: 500;
149149

150+
@media print {
151+
margin-bottom: 0.2em;
152+
}
153+
150154
a {
151155
font-weight: 500;
152156
}
@@ -192,4 +196,10 @@ p.quote {
192196
font-style: italic;
193197
padding: 1em 2.5em;
194198
text-align: center;
199+
200+
@media print {
201+
text-align: left;
202+
padding: 0em 1em;
203+
margin-top: 1em;
204+
}
195205
}

Diff for: ‎lib/modern-resume-theme/version.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
module ModernResumeTheme
2-
VERSION = "1.2.1"
2+
VERSION = "1.3.0"
33
end

0 commit comments

Comments
 (0)