Skip to content

Commit be56a0e

Browse files
committed
Update to latest Jekyll version
1 parent e8c2ae4 commit be56a0e

15 files changed

Lines changed: 526 additions & 743 deletions

File tree

Gemfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ source "https://rubygems.org"
88
#
99
# This will help ensure the proper Jekyll version is running.
1010
# Happy Jekylling!
11-
gem "jekyll", "~> 3.8.3"
11+
gem "jekyll", "~> 4.2.0"
1212

1313
# This is the default theme for new Jekyll sites. You may change this to anything you like.
1414
gem "minima", "~> 2.0"
@@ -19,7 +19,7 @@ gem "minima", "~> 2.0"
1919

2020
# If you have any plugins, put them here!
2121
group :jekyll_plugins do
22-
gem "jekyll-feed", "~> 0.6"
22+
gem "jekyll-feed"
2323
gem 'jekyll-sitemap'
2424
gem 'jekyll-seo-tag'
2525
gem 'jemoji'

Gemfile.lock

Lines changed: 67 additions & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -1,99 +1,104 @@
11
GEM
22
remote: https://rubygems.org/
33
specs:
4-
activesupport (5.2.1)
4+
activesupport (6.1.1)
55
concurrent-ruby (~> 1.0, >= 1.0.2)
6-
i18n (>= 0.7, < 2)
7-
minitest (~> 5.1)
8-
tzinfo (~> 1.1)
9-
addressable (2.5.2)
10-
public_suffix (>= 2.0.2, < 4.0)
6+
i18n (>= 1.6, < 2)
7+
minitest (>= 5.1)
8+
tzinfo (~> 2.0)
9+
zeitwerk (~> 2.3)
10+
addressable (2.7.0)
11+
public_suffix (>= 2.0.2, < 5.0)
1112
colorator (1.1.0)
12-
concurrent-ruby (1.0.5)
13-
em-websocket (0.5.1)
13+
concurrent-ruby (1.1.7)
14+
em-websocket (0.5.2)
1415
eventmachine (>= 0.12.9)
1516
http_parser.rb (~> 0.6.0)
1617
eventmachine (1.2.7)
17-
ffi (1.9.25)
18+
ffi (1.14.2)
1819
forwardable-extended (2.6.0)
19-
gemoji (3.0.0)
20-
html-pipeline (2.9.1)
20+
gemoji (3.0.1)
21+
html-pipeline (2.14.0)
2122
activesupport (>= 2)
2223
nokogiri (>= 1.4)
2324
http_parser.rb (0.6.0)
24-
i18n (0.9.5)
25+
i18n (1.8.7)
2526
concurrent-ruby (~> 1.0)
26-
jekyll (3.8.3)
27+
jekyll (4.2.0)
2728
addressable (~> 2.4)
2829
colorator (~> 1.0)
2930
em-websocket (~> 0.5)
30-
i18n (~> 0.7)
31-
jekyll-sass-converter (~> 1.0)
31+
i18n (~> 1.0)
32+
jekyll-sass-converter (~> 2.0)
3233
jekyll-watch (~> 2.0)
33-
kramdown (~> 1.14)
34+
kramdown (~> 2.3)
35+
kramdown-parser-gfm (~> 1.0)
3436
liquid (~> 4.0)
35-
mercenary (~> 0.3.3)
37+
mercenary (~> 0.4.0)
3638
pathutil (~> 0.9)
37-
rouge (>= 1.7, < 4)
39+
rouge (~> 3.0)
3840
safe_yaml (~> 1.0)
39-
jekyll-feed (0.10.0)
40-
jekyll (~> 3.3)
41-
jekyll-sass-converter (1.5.2)
42-
sass (~> 3.4)
43-
jekyll-seo-tag (2.5.0)
44-
jekyll (~> 3.3)
45-
jekyll-sitemap (1.2.0)
46-
jekyll (~> 3.3)
47-
jekyll-watch (2.0.0)
41+
terminal-table (~> 2.0)
42+
jekyll-feed (0.15.1)
43+
jekyll (>= 3.7, < 5.0)
44+
jekyll-sass-converter (2.1.0)
45+
sassc (> 2.0.1, < 3.0)
46+
jekyll-seo-tag (2.7.1)
47+
jekyll (>= 3.8, < 5.0)
48+
jekyll-sitemap (1.4.0)
49+
jekyll (>= 3.7, < 5.0)
50+
jekyll-watch (2.2.1)
4851
listen (~> 3.0)
49-
jemoji (0.10.1)
52+
jemoji (0.12.0)
5053
gemoji (~> 3.0)
5154
html-pipeline (~> 2.2)
52-
jekyll (~> 3.0)
53-
kramdown (1.17.0)
54-
liquid (4.0.0)
55-
listen (3.1.5)
56-
rb-fsevent (~> 0.9, >= 0.9.4)
57-
rb-inotify (~> 0.9, >= 0.9.7)
58-
ruby_dep (~> 1.2)
59-
mercenary (0.3.6)
60-
mini_portile2 (2.3.0)
61-
minima (2.5.0)
62-
jekyll (~> 3.5)
55+
jekyll (>= 3.0, < 5.0)
56+
kramdown (2.3.0)
57+
rexml
58+
kramdown-parser-gfm (1.1.0)
59+
kramdown (~> 2.0)
60+
liquid (4.0.3)
61+
listen (3.4.0)
62+
rb-fsevent (~> 0.10, >= 0.10.3)
63+
rb-inotify (~> 0.9, >= 0.9.10)
64+
mercenary (0.4.0)
65+
mini_portile2 (2.4.0)
66+
minima (2.5.1)
67+
jekyll (>= 3.5, < 5.0)
6368
jekyll-feed (~> 0.9)
6469
jekyll-seo-tag (~> 2.1)
65-
minitest (5.11.3)
66-
nokogiri (1.8.5)
67-
mini_portile2 (~> 2.3.0)
68-
pathutil (0.16.1)
70+
minitest (5.14.3)
71+
nokogiri (1.10.10)
72+
mini_portile2 (~> 2.4.0)
73+
pathutil (0.16.2)
6974
forwardable-extended (~> 2.6)
70-
public_suffix (3.0.2)
71-
rb-fsevent (0.10.3)
72-
rb-inotify (0.9.10)
73-
ffi (>= 0.5.0, < 2)
74-
rouge (3.2.0)
75-
ruby_dep (1.5.0)
76-
safe_yaml (1.0.4)
77-
sass (3.5.7)
78-
sass-listen (~> 4.0.0)
79-
sass-listen (4.0.0)
80-
rb-fsevent (~> 0.9, >= 0.9.4)
81-
rb-inotify (~> 0.9, >= 0.9.7)
82-
thread_safe (0.3.6)
83-
tzinfo (1.2.5)
84-
thread_safe (~> 0.1)
75+
public_suffix (4.0.6)
76+
rb-fsevent (0.10.4)
77+
rb-inotify (0.10.1)
78+
ffi (~> 1.0)
79+
rexml (3.2.4)
80+
rouge (3.26.0)
81+
safe_yaml (1.0.5)
82+
sassc (2.4.0)
83+
ffi (~> 1.9)
84+
terminal-table (2.0.0)
85+
unicode-display_width (~> 1.1, >= 1.1.1)
86+
tzinfo (2.0.4)
87+
concurrent-ruby (~> 1.0)
88+
unicode-display_width (1.7.0)
89+
zeitwerk (2.4.2)
8590

8691
PLATFORMS
87-
ruby
92+
x86_64-darwin-20
8893

8994
DEPENDENCIES
90-
jekyll (~> 3.8.3)
91-
jekyll-feed (~> 0.6)
95+
jekyll (~> 4.2.0)
96+
jekyll-feed
9297
jekyll-seo-tag
9398
jekyll-sitemap
9499
jemoji
95100
minima (~> 2.0)
96101
tzinfo-data
97102

98103
BUNDLED WITH
99-
1.16.3
104+
2.2.3

_config.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
title: Sparkplug
1717
email: ray@sparkpl.ug
1818
description: >- # this means to ignore newlines until "baseurl:"
19-
Building better products for our clients since 2013.
19+
Building better digital products for our clients since 2013.
2020
baseurl: "" # the subpath of your site, e.g. /blog
2121
url: "http://sparkpl.ug" # the base hostname & protocol for your site, e.g. http://example.com
2222
twitter_username: sparkplugea
@@ -26,7 +26,10 @@ github_username: sparkplugea
2626
markdown: kramdown
2727
theme: minima
2828
plugins:
29+
- jemoji
2930
- jekyll-feed
31+
- jekyll-seo-tag
32+
- jekyll-sitemap
3033

3134
# SEO/Meta settings
3235
author: Sparkplug

_includes/footer.html

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<footer class="w-100 cf tc ph3 ph4-m ph6-l pv4 pv6-ns wow animated fadeInUp">
22
<nav class="wow animated fadeIn">
33
<ul class="f4 list pa0 mv4 lh-copy">
4-
<li class="dib mr2"><a class="link underline-hover dark-gray b ttu" href="/#services" >Services</a></li>
5-
<li class="dib mr2"><a class="link underline-hover dark-gray b ttu" rel="noopener" href="https://airtable.com/shrkwvdNHX1Ua3rAb" target="_blank">Contact</a></li>
4+
<li class="dib mr2"><a class="link underline-hover black-90 ttu" href="/#services" >Services</a></li>
5+
<li class="dib mr2"><a class="link underline-hover black-90 ttu" href="/contact/">Contact</a></li>
66
</ul>
77
</nav>
88
<ul class="list pl0 lh-copy">
@@ -11,7 +11,10 @@
1111
<li class="dib mr2"><a class="link underline-hover dark-gray b ttu" href="/feed.xml"><small>RSS Feed</small></a></li>
1212
<li class="dib mr2"><a class="link underline-hover dark-gray b ttu" href="/sitemap.xml"><small>Sitemap</small></a></li>
1313
</ul>
14-
<small class="w-100 db mv2 lh-copy">Copyright <i class="fa fa-fw fa-copyright"></i>2018 Sparkplug. All rights reserved.</small>
14+
<a class="mb0 mb0-l tc" href="/" title="Sparkplug">
15+
<img src="/img/sparkplug.svg" style="height: 3rem" class="dib pa1" alt="avatar" alt="Sparkplug">
16+
</a>
17+
<small class="w-100 db mv2 lh-copy">&copy; <i class="fa fa-fw fa-copyright"></i>2021 Sparkplug.</small>
1518
<small class="w-100 db mv2 lh-copy">Made in Kampala, Uganda.</small>
16-
<a class="db link underline-hover gray" href="#cornerstone" data-scroll><small>Back to Top</small></a>
19+
<a class="db link underline-hover gray" href="/#cornerstone" data-scroll><small>Back to Top</small></a>
1720
</footer>

_layouts/default.html

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,13 @@
77
<div class="w-100">
88
<nav class="dt w-100 mw9 center ph4-ns pv3">
99
<div class="db dtc-l v-mid w-100 w-30-l tc tl-l">
10-
<a class="grow-large mb0 mb0-l" href="/" title="Tribe Kampala">
11-
<img src="/img/sparkpluglogo.png" class="dib pa1" alt="avatar" alt="Sparkplug">
10+
<a class="mb0 mb0-l" href="/" title="Sparkplug">
11+
<img src="/img/sp-logotype.svg" style="height: 3rem" class="dib pa1" alt="avatar" alt="Sparkplug">
1212
</a>
1313
</div>
1414
<div class="db dtc-l v-mid w-100 w-60-l tc tr-l">
15-
<a class="link hover-black-90 no-underline underline-hover black-70 f5 f5-l lh-title dib mr3 mr4-l" href="/#services" title="Services at Sparkplug">Services</a>
16-
<a class="f5 fw4 font-smoothing-hover hover-bg-black-80 hover-white no-underline black-70 dib ml2 pv2 ph3 ba-ns br2-ns bw1-ns" href="https://airtable.com/shrkwvdNHX1Ua3rAb" target="_blank" rel="noopener" title="Contact Sparkplug">Contact Us</a>
15+
<a class="link hover-black-90 no-underline underline-hover black-90 f5 f5-l lh-title dib mr3 mr4-l" href="/#services" title="Services at Sparkplug">Services</a>
16+
<a class="f5 fw4 font-smoothing-hover hover-bg-black-90 hover-white no-underline black-90 dib ml2 pv2 ph3 ba-ns br2-ns bw1-ns" href="/contact/" title="Contact Sparkplug">Contact Us</a>
1717
</div>
1818
</nav>
1919
</div>

_site/404.html

Lines changed: 26 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -11,23 +11,25 @@
1111
<meta name="author" content="Sparkplug">
1212
<meta name="google-site-verification" content="" />
1313

14-
<!-- Begin Jekyll SEO tag v2.5.0 -->
15-
<title>Sparkplug | Building better products for our clients since 2013.</title>
16-
<meta name="generator" content="Jekyll v3.8.3" />
14+
<!-- Begin Jekyll SEO tag v2.7.1 -->
15+
<title>Sparkplug | Building better digital products for our clients since 2013.</title>
16+
<meta name="generator" content="Jekyll v4.2.0" />
1717
<meta property="og:title" content="Sparkplug" />
1818
<meta name="author" content="Sparkplug" />
1919
<meta property="og:locale" content="en_US" />
20-
<meta name="description" content="Building better products for our clients since 2013." />
21-
<meta property="og:description" content="Building better products for our clients since 2013." />
22-
<link rel="canonical" href="http://localhost:4000/404.html" />
23-
<meta property="og:url" content="http://localhost:4000/404.html" />
20+
<meta name="description" content="Building better digital products for our clients since 2013." />
21+
<meta property="og:description" content="Building better digital products for our clients since 2013." />
22+
<link rel="canonical" href="http://sparkpl.ug/404.html" />
23+
<meta property="og:url" content="http://sparkpl.ug/404.html" />
2424
<meta property="og:site_name" content="Sparkplug" />
25-
<meta property="og:image" content="http://localhost:4000/img/sparkplug-tech-work.jpg" />
25+
<meta property="og:image" content="http://sparkpl.ug/img/sparkplug-tech-work.jpg" />
2626
<meta name="twitter:card" content="summary_large_image" />
27+
<meta property="twitter:image" content="http://sparkpl.ug/img/sparkplug-tech-work.jpg" />
28+
<meta property="twitter:title" content="Sparkplug" />
2729
<meta name="twitter:site" content="@sparkplugea" />
2830
<meta name="twitter:creator" content="@Sparkplug" />
2931
<script type="application/ld+json">
30-
{"description":"Building better products for our clients since 2013.","author":{"@type":"Person","name":"Sparkplug"},"@type":"WebPage","url":"http://localhost:4000/404.html","image":"http://localhost:4000/img/sparkplug-tech-work.jpg","headline":"Sparkplug","@context":"http://schema.org"}</script>
32+
{"author":{"@type":"Person","name":"Sparkplug"},"image":"http://sparkpl.ug/img/sparkplug-tech-work.jpg","description":"Building better digital products for our clients since 2013.","url":"http://sparkpl.ug/404.html","@type":"WebPage","headline":"Sparkplug","@context":"https://schema.org"}</script>
3133
<!-- End Jekyll SEO tag -->
3234

3335

@@ -49,12 +51,12 @@
4951
<meta name="twitter:title" content="">
5052

5153

52-
<meta name="twitter:description" content="Building better products for our clients since 2013.">
54+
<meta name="twitter:description" content="Building better digital products for our clients since 2013.">
5355

5456

5557

5658
<meta name="twitter:card" content="summary_large_image">
57-
<meta name="twitter:image" content="http://localhost:4000/img/sparkplug-tech-work.jpg">
59+
<meta name="twitter:image" content="http://sparkpl.ug/img/sparkplug-tech-work.jpg">
5860

5961
<!-- end of Twitter cards -->
6062

@@ -71,7 +73,7 @@
7173
<link rel="manifest" href="manifest.json">
7274

7375

74-
<meta property="og:image" content="http://localhost:4000//img/sparkplug-tech-work.jpg" />
76+
<meta property="og:image" content="http://sparkpl.ug//img/sparkplug-tech-work.jpg" />
7577

7678

7779
<meta property="og:description" content="" />
@@ -83,19 +85,19 @@
8385
<div class="w-100">
8486
<nav class="dt w-100 mw9 center ph4-ns pv3">
8587
<div class="db dtc-l v-mid w-100 w-30-l tc tl-l">
86-
<a class="grow-large mb0 mb0-l" href="/" title="Tribe Kampala">
87-
<img src="/img/sparkpluglogo.png" class="dib pa1" alt="avatar">
88+
<a class="mb0 mb0-l" href="/" title="Sparkplug">
89+
<img src="/img/sp-logotype.svg" style="height: 3rem" class="dib pa1" alt="avatar">
8890
</a>
8991
</div>
9092
<div class="db dtc-l v-mid w-100 w-60-l tc tr-l">
91-
<a class="link hover-black-90 no-underline underline-hover black-70 f5 f5-l lh-title dib mr3 mr4-l" href="/#services" title="Services at Sparkplug">Services</a>
92-
<a class="f5 fw4 font-smoothing-hover hover-bg-black-80 hover-white no-underline black-70 dib ml2 pv2 ph3 ba-ns br2-ns bw1-ns" href="https://airtable.com/shrkwvdNHX1Ua3rAb" target="_blank" rel="noopener" title="Contact Sparkplug">Contact Us</a>
93+
<a class="link hover-black-90 no-underline underline-hover black-90 f5 f5-l lh-title dib mr3 mr4-l" href="/#services" title="Services at Sparkplug">Services</a>
94+
<a class="f5 fw4 font-smoothing-hover hover-bg-black-90 hover-white no-underline black-90 dib ml2 pv2 ph3 ba-ns br2-ns bw1-ns" href="/contact/" title="Contact Sparkplug">Contact Us</a>
9395
</div>
9496
</nav>
9597
</div>
9698
<div class="tc mt4 mt5-m mt6-l ph3 pv5">
9799
<h1 class="f1 f1-l fw2 black-90 mb0 lh-title">
98-
<img class="emoji" title=":sob:" alt=":sob:" src="https://assets-cdn.github.com/images/icons/emoji/unicode/1f62d.png" height="20" width="20"> 404 <img class="emoji" title=":sob:" alt=":sob:" src="https://assets-cdn.github.com/images/icons/emoji/unicode/1f62d.png" height="20" width="20">
100+
<img class="emoji" title=":sob:" alt=":sob:" src="https://github.githubassets.com/images/icons/emoji/unicode/1f62d.png" height="20" width="20"> 404 <img class="emoji" title=":sob:" alt=":sob:" src="https://github.githubassets.com/images/icons/emoji/unicode/1f62d.png" height="20" width="20">
99101
</h1>
100102

101103
<p><strong>The requested page could not be found</strong></p>
@@ -108,8 +110,8 @@ <h1 class="f1 f1-l fw2 black-90 mb0 lh-title">
108110
<footer class="w-100 cf tc ph3 ph4-m ph6-l pv4 pv6-ns wow animated fadeInUp">
109111
<nav class="wow animated fadeIn">
110112
<ul class="f4 list pa0 mv4 lh-copy">
111-
<li class="dib mr2"><a class="link underline-hover dark-gray b ttu" href="/#services">Services</a></li>
112-
<li class="dib mr2"><a class="link underline-hover dark-gray b ttu" rel="noopener" href="https://airtable.com/shrkwvdNHX1Ua3rAb" target="_blank">Contact</a></li>
113+
<li class="dib mr2"><a class="link underline-hover black-90 ttu" href="/#services">Services</a></li>
114+
<li class="dib mr2"><a class="link underline-hover black-90 ttu" href="/contact/">Contact</a></li>
113115
</ul>
114116
</nav>
115117
<ul class="list pl0 lh-copy">
@@ -118,9 +120,12 @@ <h1 class="f1 f1-l fw2 black-90 mb0 lh-title">
118120
<li class="dib mr2"><a class="link underline-hover dark-gray b ttu" href="/feed.xml"><small>RSS Feed</small></a></li>
119121
<li class="dib mr2"><a class="link underline-hover dark-gray b ttu" href="/sitemap.xml"><small>Sitemap</small></a></li>
120122
</ul>
121-
<small class="w-100 db mv2 lh-copy">Copyright <i class="fa fa-fw fa-copyright"></i>2018 Sparkplug. All rights reserved.</small>
123+
<a class="mb0 mb0-l tc" href="/" title="Sparkplug">
124+
<img src="/img/sparkplug.svg" style="height: 3rem" class="dib pa1" alt="avatar">
125+
</a>
126+
<small class="w-100 db mv2 lh-copy">© <i class="fa fa-fw fa-copyright"></i>2021 Sparkplug.</small>
122127
<small class="w-100 db mv2 lh-copy">Made in Kampala, Uganda.</small>
123-
<a class="db link underline-hover gray" href="#cornerstone" data-scroll><small>Back to Top</small></a>
128+
<a class="db link underline-hover gray" href="/#cornerstone" data-scroll><small>Back to Top</small></a>
124129
</footer>
125130

126131

0 commit comments

Comments
 (0)