Skip to content

Commit b6825bd

Browse files
sproogensproogen
authored
Merge pull request #80 from sproogen/release/1.8
Release/1.8
2 parents 6c69b5d + acf7de5 commit b6825bd

19 files changed

+212
-72
lines changed

Diff for: ‎Gemfile.lock

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
PATH
22
remote: .
33
specs:
4-
modern-resume-theme (1.7.1)
4+
modern-resume-theme (1.8.0)
55
github-pages (~> 198)
66
jekyll-seo-tag (~> 2.1)
77

@@ -270,4 +270,4 @@ DEPENDENCIES
270270
modern-resume-theme!
271271

272272
BUNDLED WITH
273-
1.15.2
273+
2.1.0

Diff for: ‎Procfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
web: bundle exec jekyll serve --no-watch --port $PORT --host 0.0.0.0
1+
web: bundle exec jekyll serve --config _test/_config.yml --no-watch --port $PORT --host 0.0.0.0

Diff for: ‎_config.yml

+20-1
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,12 @@ email: Your email (optional)
99
phone: Your phone number (optional)
1010
website: Your website (eg. https://google.com)(optional)
1111

12+
darkmode: false
13+
1214
# Social links
1315
twitter_username: jekyllrb
1416
github_username: jekyll
17+
stackoverflow_username: "00000001"
1518
dribbble_username: jekyll
1619
facebook_username: jekyll
1720
flickr_username: jekyll
@@ -21,6 +24,22 @@ xing_username: jekyll
2124
pinterest_username: jekyll
2225
youtube_username: jekyll
2326
googleplus_username: +jekyll
27+
orcid_username: 0000-0000-0000-0000
28+
29+
# Additional icon links
30+
additional_links:
31+
- title: Link name
32+
icon: Font Awesome brand icon name (eg. fa-twitter) (https://fontawesome.com/icons?d=gallery&s=brands&m=free)
33+
url: Link url (eg. https://google.com)
34+
# - title: another link
35+
# icon: font awesome brand icon name (eg. fa-twitter) (https://fontawesome.com/icons?d=gallery&s=brands&m=free)
36+
# url: Link url (eg. https://google.com)
37+
38+
# Google Analytics and Tag Manager
39+
# Using more than one of these may cause issues with reporting
40+
# gtm: "GTM-0000000"
41+
# gtag: "UA-00000000-0"
42+
# google_analytics: "UA-00000000-0"
2443

2544
# About Section
2645
# about_title: About Me (Use this to override about section title)
@@ -31,7 +50,7 @@ about_content: | # this will include new lines to allow paragraphs
3150
You can even add paragraphs by using empty lines like this and add anything else markdown supports such as
3251
- Lists
3352
- Tables
34-
- Links
53+
- <a href="google.com">Links</a>
3554
- Images
3655
3756
# Projects Section

Diff for: ‎_includes/about.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ <h3>{{ site.about_title | default: "About Me" }}</h3>
33
<div class="row clearfix">
44
{%- if site.about_profile_image -%}
55
<div class="col-xs-12 col-sm-4 col-md-3 no-print">
6-
<span class="profile-img" style="background-image: url({{ site.about_profile_image | relative_url }})" />
6+
<span class="profile-img" style="background-image: url({{ site.about_profile_image | relative_url }})"></span>
77
</div>
88
{%- endif -%}
99
<div class="{{ 'col-xs-12 ' }}{%- if site.about_profile_image -%}col-sm-8 col-md-9 col-print-12{%- endif -%}">

Diff for: ‎_includes/google-analytics.html

+3
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
2+
<!-- Google Analytics -->
13
<script>
24
if(!(window.doNotTrack === "1" || navigator.doNotTrack === "1" || navigator.doNotTrack === "yes" || navigator.msDoNotTrack === "1")) {
35
(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
@@ -8,3 +10,4 @@
810
ga('send', 'pageview');
911
}
1012
</script>
13+
<!-- End Google Analytics -->

Diff for: ‎_includes/gtag.html

+10
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
<!-- Global site tag (gtag.js) - Google Analytics -->
2+
<script async src="https://www.googletagmanager.com/gtag/js?id={{ site.gtag }}"></script>
3+
<script>
4+
window.dataLayer = window.dataLayer || [];
5+
function gtag(){dataLayer.push(arguments);}
6+
gtag('js', new Date());
7+
8+
gtag('config', '{{ site.gtag }}');
9+
</script>
10+
<!-- End global site tag (gtag.js) - Google Analytics -->

Diff for: ‎_includes/gtm_body.html

+4
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
<!-- Google Tag Manager (noscript) -->
2+
<noscript><iframe src="https://www.googletagmanager.com/ns.html?id={{ site.gtm }}"
3+
height="0" width="0" style="display:none;visibility:hidden"></iframe></noscript>
4+
<!-- End Google Tag Manager (noscript) -->

Diff for: ‎_includes/gtm_head.html

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
<!-- Google Tag Manager -->
2+
<script>(function(w,d,s,l,i){w[l]=w[l]||[];w[l].push({'gtm.start':
3+
new Date().getTime(),event:'gtm.js'});var f=d.getElementsByTagName(s)[0],
4+
j=d.createElement(s),dl=l!='dataLayer'?'&l='+l:'';j.async=true;j.src=
5+
'https://www.googletagmanager.com/gtm.js?id='+i+dl;f.parentNode.insertBefore(j,f);
6+
})(window,document,'script','dataLayer','{{ site.gtm }}');</script>
7+
<!-- End Google Tag Manager -->

Diff for: ‎_includes/head.html

+7-1
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,15 @@
77
{%- seo title=false -%}
88

99
<link rel="stylesheet" href="{{ '/assets/main.css' | relative_url }}">
10-
<link rel="shortcut icon" type="image/x-icon" href="{{ site.favicon | relative_url }}">
10+
<link rel="shortcut icon" type="image/x-icon" href="{{ site.favicon | default: '/assets/favicon.ico' | relative_url }}">
1111

1212
{%- if jekyll.environment == 'production' and site.google_analytics -%}
1313
{%- include google-analytics.html -%}
1414
{%- endif -%}
15+
{%- if jekyll.environment == 'production' and site.gtm -%}
16+
{%- include gtm_head.html -%}
17+
{%- endif -%}
18+
{%- if jekyll.environment == 'production' and site.gtag -%}
19+
{%- include gtag.html -%}
20+
{%- endif -%}
1521
</head>

Diff for: ‎_includes/header.html

+21
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,13 @@ <h2>{{ site.title | escape }}</h2>
3434
</a>
3535
</li>
3636
{%- endif -%}
37+
{%- if site.stackoverflow_username -%}
38+
<li>
39+
<a target="_blank" href="https://stackoverflow.com/users/{{ site.stackoverflow_username| cgi_escape | escape }}" class="button button--sacnite button--round-l">
40+
<i class="fab fa-stack-overflow" title="Stackoverflow link"></i>
41+
</a>
42+
</li>
43+
{%- endif -%}
3744
{%- if site.instagram_username -%}
3845
<li>
3946
<a target="_blank" href="https://www.instagram.com/{{ site.instagram_username| cgi_escape | escape }}" class="button button--sacnite button--round-l">
@@ -83,6 +90,20 @@ <h2>{{ site.title | escape }}</h2>
8390
</a>
8491
</li>
8592
{%- endif -%}
93+
{%- if site.orcid_username -%}
94+
<li>
95+
<a target="_blank" href="https://orcid.org/{{ site.orcid_username | escape }}" class="button button--sacnite button--round-l">
96+
<i class="fab fa-orcid" title="ORCiD link"></i>
97+
</a>
98+
</li>
99+
{%- endif -%}
100+
{% for link in site.additional_links %}
101+
<li>
102+
{% include a.html href=link.url class="button button--sacnite button--round-l" %}
103+
<i class="fab {{ link.icon }}" title="{{ link.title | escape }}"></i>
104+
</a>
105+
</li>
106+
{% endfor %}
86107
</ul>
87108

88109
{%- if site.email -%}

Diff for: ‎_layouts/default.html

+8-4
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,19 @@
11
<!DOCTYPE html>
2-
<html lang="{{ page.lang | default: site.lang | default: " en " }}">
2+
<html lang="{{ page.lang | default: site.lang | default: 'en' }}">
33

44
{%- include head.html -%}
55

6-
<body>
6+
<body class="{% if site.darkmode %}dark{% endif %}">
77

88
{%- include header.html -%}
99

1010
<main class="page-content" aria-label="Content">
1111
<div class="wrapper">
1212

13+
{%- if jekyll.environment == 'production' and site.gtm -%}
14+
{%- include gtm_body.html -%}
15+
{%- endif -%}
16+
1317
{%- include about.html -%}
1418

1519
{%- if site.data.projects.size > 0 -%}
@@ -32,7 +36,7 @@
3236
</main>
3337

3438
{%- include footer.html -%}
35-
39+
<script src="{{ '/assets/js/index.js' | relative_url }}"></script>
3640
</body>
3741

38-
</html>
42+
</html>

Diff for: ‎_sass/button.scss

+23-13
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,7 @@
1515
}
1616

1717
.button {
18-
float: left;
1918
min-width: 150px;
20-
max-width: 250px;
21-
display: block;
22-
margin: 1em;
23-
padding: 1em 2em;
2419
border: none;
2520
background: none;
2621
color: inherit;
@@ -29,13 +24,6 @@
2924
z-index: 1;
3025
-webkit-backface-visibility: hidden;
3126
-moz-osx-font-smoothing: grayscale;
32-
}
33-
34-
.button--round-l {
35-
border-radius: 40px;
36-
}
37-
38-
.button {
3927
border-radius: 0;
4028
float: none;
4129
margin: 0 auto;
@@ -46,6 +34,10 @@
4634
max-width: 400px;
4735
}
4836

37+
.button--round-l {
38+
border-radius: 40px;
39+
}
40+
4941
.button.button--sacnite {
5042
width: 60px;
5143
height: 60px;
@@ -64,4 +56,22 @@
6456
box-shadow: inset 0 0 0 2px #333;
6557
-webkit-transform: scale3d(1, 1, 1);
6658
transform: scale3d(1, 1, 1);
67-
}
59+
}
60+
61+
.dark {
62+
.button--sacnite::before {
63+
box-shadow: inset 0 0 0 35px #e6e6e6;
64+
}
65+
66+
.button.button--sacnite {
67+
color: #222;
68+
}
69+
70+
.button--sacnite:hover {
71+
color: #e6e6e6;
72+
}
73+
74+
.button--sacnite:hover::before {
75+
box-shadow: inset 0 0 0 2px #e6e6e6;
76+
}
77+
}

Diff for: ‎_sass/dark.scss

+16
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
.dark,
2+
.dark * {
3+
background-color: #222;
4+
color: #e6e6e6;
5+
}
6+
7+
.dark {
8+
mark {
9+
color: #222;
10+
background-color: #e6e6e6;
11+
}
12+
13+
a {
14+
color: #477dca;
15+
}
16+
}

Diff for: ‎_sass/icons.scss

+54
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
1+
ul.icons a:hover {
2+
background: rgba(0, 0, 0, 0.025);
3+
}
4+
5+
ul.icons li {
6+
display: inline-block;
7+
padding-left: 0.75em;
8+
}
9+
10+
ul.icons a {
11+
-moz-transition: background-color 0.25s ease-in-out;
12+
-webkit-transition: background-color 0.25s ease-in-out;
13+
-ms-transition: background-color 0.25s ease-in-out;
14+
transition: background-color 0.25s ease-in-out;
15+
display: inline-block;
16+
width: 2.75em;
17+
height: 2.75em;
18+
line-height: 2.8em;
19+
text-align: center;
20+
border: 0;
21+
box-shadow: none;
22+
padding:0;
23+
border-radius: 100%;
24+
color: #aaa;
25+
}
26+
27+
.icons i {
28+
font-size: 30px;
29+
line-height:60px;
30+
}
31+
32+
.icons {
33+
padding: 0;
34+
font-size: 1em;
35+
margin-bottom:20px;
36+
text-align: right;
37+
}
38+
39+
@media screen and (max-width: 768px) {
40+
.icons {
41+
text-align: center;
42+
}
43+
}
44+
45+
.dark {
46+
.icons i {
47+
background: none;
48+
color: #222;
49+
}
50+
51+
.icons a:hover i {
52+
color: #e6e6e6;
53+
}
54+
}

0 commit comments

Comments
 (0)