Skip to content

Commit c1e3103

Browse files
irismessageirismessage
committed
Sync and clean _layouts and _includes
1 parent 6f74ad6 commit c1e3103

File tree

9 files changed

+44
-214
lines changed

9 files changed

+44
-214
lines changed

‎Gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ ruby "~> 2.7" # workaround
2222
group :jekyll_plugins do
2323
gem "jekyll-feed", "~> 0.6"
2424
gem "jekyll-paginate", "~> 1.1.0"
25-
gem "jekyll-category-pages", "~> 1.0"
25+
# gem "jekyll-category-pages", "~> 1.0"
2626
end
2727

2828
# Windows does not include zoneinfo files, so bundle the tzinfo-data gem

‎Gemfile.lock

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ GEM
77
minitest (~> 5.1)
88
tzinfo (~> 1.1)
99
zeitwerk (~> 2.2, >= 2.2.2)
10-
addressable (2.8.1)
10+
addressable (2.8.4)
1111
public_suffix (>= 2.0.2, < 6.0)
1212
coffee-script (2.4.1)
1313
coffee-script-source
@@ -17,8 +17,8 @@ GEM
1717
commonmarker (0.17.13)
1818
ruby-enum (~> 0.5)
1919
concurrent-ruby (1.2.2)
20-
dnsruby (1.61.9)
21-
simpleidn (~> 0.1)
20+
dnsruby (1.70.0)
21+
simpleidn (~> 0.2.1)
2222
em-websocket (0.5.3)
2323
eventmachine (>= 0.12.9)
2424
http_parser.rb (~> 0)
@@ -104,9 +104,6 @@ GEM
104104
safe_yaml (~> 1.0)
105105
jekyll-avatar (0.7.0)
106106
jekyll (>= 3.0, < 5.0)
107-
jekyll-category-pages (1.0.1)
108-
jekyll (~> 3.5)
109-
jekyll-paginate (~> 1.1, >= 1.0.0)
110107
jekyll-coffeescript (1.1.1)
111108
coffee-script (~> 2.2)
112109
coffee-script-source (~> 1.11.1)
@@ -213,10 +210,10 @@ GEM
213210
jekyll-feed (~> 0.9)
214211
jekyll-seo-tag (~> 2.1)
215212
minitest (5.18.0)
216-
nokogiri (1.14.2)
213+
nokogiri (1.14.3)
217214
mini_portile2 (~> 2.8.0)
218215
racc (~> 1.4)
219-
nokogiri (1.14.2-x86_64-linux)
216+
nokogiri (1.14.3-x86_64-linux)
220217
racc (~> 1.4)
221218
octokit (4.25.1)
222219
faraday (>= 1, < 3)
@@ -252,7 +249,7 @@ GEM
252249
ethon (>= 0.9.0)
253250
tzinfo (1.2.11)
254251
thread_safe (~> 0.1)
255-
tzinfo-data (1.2023.2)
252+
tzinfo-data (1.2023.3)
256253
tzinfo (>= 1.0.0)
257254
unf (0.1.4)
258255
unf_ext
@@ -267,7 +264,6 @@ PLATFORMS
267264

268265
DEPENDENCIES
269266
github-pages (~> 219)
270-
jekyll-category-pages (~> 1.0)
271267
jekyll-feed (~> 0.6)
272268
jekyll-paginate (~> 1.1.0)
273269
kramdown-parser-gfm
@@ -280,4 +276,4 @@ RUBY VERSION
280276
ruby 2.7.7p221
281277

282278
BUNDLED WITH
283-
2.4.9
279+
2.4.12

‎_config.yml

Lines changed: 12 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ author: jmcb
1818
email: joelsgp@protonmail.com
1919
description: >- # this means to ignore newlines until "baseurl:"
2020
baseurl: "" # the subpath of your site, e.g. /blog
21-
url: "" # the base hostname & protocol for your site, e.g. http://example.com
21+
url: "https://joels.me" # the base hostname & protocol for your site, e.g. http://example.com
2222

2323
# Build settings
2424
markdown: kramdown
@@ -45,22 +45,20 @@ banner:
4545
# https://github.com/jekyll/jekyll-seo-tag
4646
locale: en_GB
4747

48-
# https://github.com/jekyll/minima
48+
# https://github.com/jekyll/minima/tree/2.5-stable#change-default-date-format
4949
minima:
5050
date_format: "%Y-%m-%d"
5151

52-
# https://github.com/jekyll/minima/tree/2.5-stable#social-networks
53-
social_links:
54-
github: joelsgp
55-
gitlab:
56-
- username: joelsgp
57-
instance: gitlab.com
58-
mastodon:
59-
- username: sgp
60-
instance: mastodon.online
61-
twitter: JMB_9
62-
youtube_channel: UC9uiKKat6M6CBLaXOEsIhcA
63-
youtube_channel_name: Sgp10
52+
# https://github.com/jekyll/minima/tree/2.5-stable#social-networks
53+
twitter_username: JMB_9
54+
github_username: joelsgp
55+
youtube_username: Sgp10
56+
gitlab:
57+
- username: joelsgp
58+
instance: gitlab.com
59+
mastodon:
60+
- username: sgp
61+
instance: mastodon.online
6462

6563

6664

‎_includes/footer.html

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
{% comment %}
2-
https://github.com/jekyll/minima/blob/master/_includes/footer.html
2+
<!-- https://github.com/jekyll/minima/blob/2.5-stable/_includes/footer.html -->
3+
<!-- This changes the third column to unescape the site description so I can put links in it -->
34
{% endcomment %}
45

56
<footer class="site-footer h-card">
@@ -30,7 +31,7 @@ <h2 class="footer-heading">{{ site.title | escape }}</h2>
3031
</div>
3132

3233
<div class="footer-col footer-col-3">
33-
<p>{{ site.footer_desc }}</p>
34+
<p>{{- site.footer_desc -}}</p>
3435
</div>
3536
</div>
3637

‎_includes/header.html

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
{% comment %}
2+
<!-- https://github.com/jekyll/minima/blob/2.5-stable/_includes/header.html -->
3+
<!-- This removes the links to pages and categories that usually appear at the top right -->
4+
{% endcomment %}
5+
6+
17
<header class="site-header" role="banner">
28

39
<div class="wrapper">

‎_includes/social.html

Lines changed: 15 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,20 @@
11
{% comment %}
2-
https://github.com/jekyll/minima/blob/master/_includes/social.html
2+
<!-- https://github.com/jekyll/minima/blob/2.5-stable/_includes/social.html -->
3+
<!-- This adds GitLab, and adds an @ to the YouTube url to use the new channel link format, adds rel="me" to mst -->
34
{% endcomment %}
45

5-
{%- assign social = site.minima.social_links -%}
6-
76
<ul class="social-media-list">
8-
{%- for glb in social.gitlab -%}{%- if glb.username and glb.instance -%}<li><a rel="me" href="https://{{ glb.instance | cgi_escape | escape}}/{{glb.username}}" title="{{ glb.username | escape }}"><svg class="svg-icon grey"><use xlink:href="{{ '/assets/minima-social-icons.svg#gitlab' | relative_url }}"></use></svg></a></li>{%- endif -%}{%- endfor -%}
9-
{%- if social.dribbble -%}<li><a rel="me" href="https://dribbble.com/{{ social.dribbble | cgi_escape | escape }}" title="{{ social.dribbble | escape }}"><svg class="svg-icon grey"><use xlink:href="{{ '/assets/minima-social-icons.svg#dribbble' | relative_url }}"></use></svg></a></li>{%- endif -%}
10-
{%- if social.facebook -%}<li><a rel="me" href="https://www.facebook.com/{{ social.facebook | cgi_escape | escape }}" title="{{ social.facebook | escape }}"><svg class="svg-icon grey"><use xlink:href="{{ '/assets/minima-social-icons.svg#facebook' | relative_url }}"></use></svg></a></li>{%- endif -%}
11-
{%- if social.flickr -%}<li><a rel="me" href="https://www.flickr.com/photos/{{ social.flickr | cgi_escape | escape }}" title="{{ social.flickr | escape }}"><svg class="svg-icon grey"><use xlink:href="{{ '/assets/minima-social-icons.svg#flickr' | relative_url }}"></use></svg></a></li>{%- endif -%}
12-
{%- if social.github -%}<li><a rel="me" href="https://github.com/{{ social.github | cgi_escape | escape }}" title="{{ social.github | escape }}"><svg class="svg-icon grey"><use xlink:href="{{ '/assets/minima-social-icons.svg#github' | relative_url }}"></use></svg></a></li>{%- endif -%}
13-
{%- if social.stackoverflow -%}<li><a rel="me" href="https://stackoverflow.com/users/{{ social.stackoverflow | cgi_escape | escape }}" title="{{ social.stackoverflow | escape }}"><svg class="svg-icon grey"><use xlink:href="{{ '/assets/minima-social-icons.svg#stackoverflow' | relative_url }}"></use></svg></a></li>{%- endif -%}
14-
{%- if social.instagram -%}<li><a rel="me" href="https://www.instagram.com/{{ social.instagram | cgi_escape | escape }}" title="{{ social.instagram | escape }}"><svg class="svg-icon grey"><use xlink:href="{{ '/assets/minima-social-icons.svg#instagram' | relative_url }}"></use></svg></a></li>{%- endif -%}
15-
{%- if social.linkedin -%}<li><a rel="me" href="https://www.linkedin.com/in/{{ social.linkedin | cgi_escape | escape }}" title="{{ social.linkedin | escape }}"><svg class="svg-icon grey"><use xlink:href="{{ '/assets/minima-social-icons.svg#linkedin' | relative_url }}"></use></svg></a></li>{%- endif -%}
16-
<li><a rel="me" href="https://www.tuc.org.uk/why-join-union" title="LinkedIn"><svg class="svg-icon grey"><use xlink:href="{{ '/assets/minima-social-icons.svg#linkedin' | relative_url }}"></use></svg></a></li>
17-
{%- if social.pinterest -%}<li><a rel="me" href="https://www.pinterest.com/{{ social.pinterest | cgi_escape | escape }}" title="{{ social.pinterest | escape }}"><svg class="svg-icon grey"><use xlink:href="{{ '/assets/minima-social-icons.svg#pinterest' | relative_url }}"></use></svg></a></li>{%- endif -%}
18-
{%- for mst in social.mastodon -%}{%- if mst.username and mst.instance -%}<li><a rel="me" href="https://{{ mst.instance | cgi_escape | escape}}/@{{mst.username}}" title="{{ mst.username | escape }}"><svg class="svg-icon grey"><use xlink:href="{{ '/assets/minima-social-icons.svg#mastodon' | relative_url }}"></use></svg></a></li>{%- endif -%}{%- endfor -%}
19-
{%- if social.twitter -%}<li><a rel="me" href="https://twitter.com/{{ social.twitter | cgi_escape | escape }}" title="{{ social.twitter | escape }}"><svg class="svg-icon grey"><use xlink:href="{{ '/assets/minima-social-icons.svg#twitter' | relative_url }}"></use></svg></a></li>{%- endif -%}
20-
{%- if social.youtube -%}<li><a rel="me" href="https://www.youtube.com/{{ social.youtube | cgi_escape | escape }}" title="{{ social.youtube | escape }}"><svg class="svg-icon grey"><use xlink:href="{{ '/assets/minima-social-icons.svg#youtube' | relative_url }}"></use></svg></a></li>{%- endif -%}
21-
{%- if social.youtube_channel -%}<li><a rel="me" href="https://www.youtube.com/channel/{{ social.youtube_channel | cgi_escape | escape }}" title="{{ social.youtube_channel_name | escape | default: 'YouTube' }}"><svg class="svg-icon grey"><use xlink:href="{{ '/assets/minima-social-icons.svg#youtube' | relative_url }}"></use></svg></a></li>{%- endif -%}
22-
{%- if social.telegram -%}<li><a rel="me" href="https://t.me/{{ social.telegram | cgi_escape | escape }}" title="{{ social.telegram | escape }}"><svg class="svg-icon grey"><use xlink:href="{{ '/assets/minima-social-icons.svg#telegram' | relative_url }}"></use></svg></a></li>{%- endif -%}
23-
{%- if social.keybase -%}<li><a rel="me" href="https://keybase.io/{{ social.keybase | cgi_escape | escape }}" title="{{ social.keybase | escape }}"><svg class="svg-icon grey"><use xlink:href="{{ '/assets/minima-social-icons.svg#keybase' | relative_url }}"></use></svg></a></li>{%- endif -%}
24-
{%- if social.microdotblog -%}<li><a rel="me" href="https://micro.blog/{{ social.microdotblog | cgi_escape | escape }}" title="{{ social.microdotblog | escape }}"><svg class="svg-icon grey"><use xlink:href="{{ '/assets/minima-social-icons.svg#microdotblog' | relative_url }}"></use></svg></a></li>{%- endif -%}
25-
{%- if social.devto -%}<li><a href="https://dev.to/{{ social.devto | cgi_escape | escape }}" title="{{ social.devto | escape }}"><svg class="svg-icon grey"><use xlink:href="{{ '/assets/minima-social-icons.svg#devto' | relative_url }}"></use></svg></a></li>{%- endif -%}
7+
{%- for glb in site.gitlab -%}{%- if glb.username and glb.instance -%}<li><a rel="me" href="https://{{ glb.instance | cgi_escape | escape}}/{{glb.username}}" title="{{ glb.username | escape }}"><svg class="svg-icon grey"><use xlink:href="{{ '/assets/minima-social-icons.svg#gitlab' | relative_url }}"></use></svg> <span class="username">{{ glb.username|escape }}</span></a></li>{%- endif -%}{%- endfor -%}
8+
{%- if site.dribbble_username -%}<li><a href="https://dribbble.com/{{ site.dribbble_username| cgi_escape | escape }}"><svg class="svg-icon"><use xlink:href="{{ '/assets/minima-social-icons.svg#dribbble' | relative_url }}"></use></svg> <span class="username">{{ site.dribbble_username| escape }}</span></a></li>{%- endif -%}
9+
{%- if site.facebook_username -%}<li><a href="https://www.facebook.com/{{ site.facebook_username| cgi_escape | escape }}"><svg class="svg-icon"><use xlink:href="{{ '/assets/minima-social-icons.svg#facebook' | relative_url }}"></use></svg> <span class="username">{{ site.facebook_username| escape }}</span></a></li>{%- endif -%}
10+
{%- if site.flickr_username -%}<li><a href="https://www.flickr.com/photos/{{ site.flickr_username| cgi_escape | escape }}"><svg class="svg-icon"><use xlink:href="{{ '/assets/minima-social-icons.svg#flickr' | relative_url }}"></use></svg> <span class="username">{{ site.flickr_username| escape }}</span></a></li>{%- endif -%}
11+
{%- if site.github_username -%}<li><a href="https://github.com/{{ site.github_username| cgi_escape | escape }}"><svg class="svg-icon"><use xlink:href="{{ '/assets/minima-social-icons.svg#github' | relative_url }}"></use></svg> <span class="username">{{ site.github_username| escape }}</span></a></li>{%- endif -%}
12+
{%- if site.instagram_username -%}<li><a href="https://instagram.com/{{ site.instagram_username| cgi_escape | escape }}"><svg class="svg-icon"><use xlink:href="{{ '/assets/minima-social-icons.svg#instagram' | relative_url }}"></use></svg> <span class="username">{{ site.instagram_username| escape }}</span></a></li>{%- endif -%}
13+
{%- if site.linkedin_username -%}<li><a href="https://www.linkedin.com/in/{{ site.linkedin_username| cgi_escape | escape }}"><svg class="svg-icon"><use xlink:href="{{ '/assets/minima-social-icons.svg#linkedin' | relative_url }}"></use></svg> <span class="username">{{ site.linkedin_username| escape }}</span></a></li>{%- endif -%}
14+
{%- if site.pinterest_username -%}<li><a href="https://www.pinterest.com/{{ site.pinterest_username| cgi_escape | escape }}"><svg class="svg-icon"><use xlink:href="{{ '/assets/minima-social-icons.svg#pinterest' | relative_url }}"></use></svg> <span class="username">{{ site.pinterest_username| escape }}</span></a></li>{%- endif -%}
15+
{%- for mst in site.mastodon -%}{%- if mst.username and mst.instance -%}<li><a rel="me" href="https://{{ mst.instance| cgi_escape | escape}}/@{{mst.username}}"><svg class="svg-icon"><use xlink:href="{{ '/assets/minima-social-icons.svg#mastodon' | relative_url }}"></use></svg> <span class="username">{{ mst.username|escape }}</span></a></li>{%- endif -%}{%- endfor -%}
16+
{%- if site.twitter_username -%}<li><a href="https://www.twitter.com/{{ site.twitter_username| cgi_escape | escape }}"><svg class="svg-icon"><use xlink:href="{{ '/assets/minima-social-icons.svg#twitter' | relative_url }}"></use></svg> <span class="username">{{ site.twitter_username| escape }}</span></a></li>{%- endif -%}
17+
{%- if site.youtube_username -%}<li><a href="https://youtube.com/@{{ site.youtube_username| cgi_escape | escape }}"><svg class="svg-icon"><use xlink:href="{{ '/assets/minima-social-icons.svg#youtube' | relative_url }}"></use></svg> <span class="username">{{ site.youtube_username| escape }}</span></a></li>{%- endif -%}
18+
{%- if site.googleplus_username -%}<li><a href="https://plus.google.com/{{ site.googleplus_username| escape }}"><svg class="svg-icon"><use xlink:href="{{ '/assets/minima-social-icons.svg#googleplus' | relative_url }}"></use></svg> <span class="username">{{ site.googleplus_username| escape }}</span></a></li>{%- endif -%}
19+
{%- if site.rss -%}<li><a href="{{ 'feed.xml' | relative_url }}"><svg class="svg-icon"><use xlink:href="{{ '/assets/minima-social-icons.svg#rss' | relative_url }}"></use></svg> <span>{{ site.rss | escape }}</span></a></li>{%- endif -%}
2620
</ul>

‎_layouts/category_index.html

Lines changed: 0 additions & 74 deletions
This file was deleted.

‎_layouts/home.html

Lines changed: 0 additions & 41 deletions
This file was deleted.

0 commit comments

Comments
 (0)