Skip to content

Commit 2090b3c

Browse files
briandrumbriandrum
committed
Tons of changes
1 parent ef24f18 commit 2090b3c

38 files changed

+2298
-518
lines changed

‎README.md

+7-1
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,16 @@ Entries, and Notes.
77

88
Articles are long-form and evergreen
99

10-
Entries are long-form and time-bound (typical "blog")
10+
https://indieweb.org/article
11+
12+
Journal entries are long-form and time-bound (typical "blog" post)
13+
14+
https://indieweb.org/posts
1115

1216
Notes are brief, lack titles, and time-bound (Twitter, Threads, etc.)
1317

18+
https://indieweb.org/note
19+
1420
Enable/disable each of these post categories in _config.yml
1521

1622
## RSS

‎_config.yml

+68-3
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# #
55
################################################################################
66

7-
baseurl: /jekyll4-theme-optima
7+
# baseurl: /jekyll4-theme-optima
88

99
permalink: /:categories/:year-:month-:day-:title/
1010

@@ -25,9 +25,46 @@ plugins:
2525

2626
timezone: America/New_York
2727

28-
title: Optima
28+
# remote_theme: briandrum/jekyll4-theme-optima
29+
30+
################################################################################
31+
# #
32+
# jekyll-seo-tag #
33+
# #
34+
################################################################################
2935

36+
title: Optima
37+
# tagline:
3038
description: "Optima dies … prima fugit"
39+
# url:
40+
# author:
41+
# facebook:
42+
# app_id: 1234
43+
# publisher: 1234
44+
# admins: 1234
45+
# logo:
46+
# social:
47+
# name: Optima
48+
# links:
49+
# - https://www.facebook.com/optima
50+
# - https://www.linkedin.com/in/optima
51+
# - https://github.com/optima
52+
# - https://keybase.io/optima
53+
# webmaster_verifications:
54+
# google: 1234
55+
# bing: 1234
56+
# alexa: 1234
57+
# yandex: 1234
58+
# baidu: 1234
59+
# facebook: 1234
60+
61+
################################################################################
62+
# #
63+
# Well-known #
64+
# #
65+
################################################################################
66+
67+
include: [".well-known"]
3168

3269
################################################################################
3370
# #
@@ -76,7 +113,19 @@ optima:
76113
# Refer to https://shopify.github.io/liquid/filters/date/ if you want to
77114
# customize these.
78115
#
79-
time_and_date_short_format: "%-I:%M %P - %-d %b %Y"
116+
time_and_date_short_format: "%-I:%M %P - %b %-d, %Y"
117+
date_long_format: "%B %-d, %Y"
118+
119+
# Features
120+
#
121+
features:
122+
plausible_analytics:
123+
enabled: true
124+
domain: briandrum.github.io
125+
126+
# Plausible analytics: https://plausible.io/
127+
#
128+
plausible_analytics: briandrum.github.io
80129

81130
post_categories:
82131

@@ -102,9 +151,14 @@ optima:
102151
- pages/archives.md
103152
- pages/search.md
104153

154+
# Footer
155+
#
156+
description_title: "About"
157+
105158
# If you want to link only specific pages in your footer, uncomment this and
106159
# add the path to the pages in order as they should show up.
107160
#
161+
footer_pages_title: "Here"
108162
footer_pages:
109163
- pages/index.md
110164
- journal
@@ -114,9 +168,11 @@ optima:
114168
- pages/about.md
115169
- pages/archives.md
116170
- pages/search.md
171+
- pages/analytics.md
117172

118173
# Generate social links in footer.
119174
#
175+
social_links_title: "Keep in touch"
120176
social_links:
121177
# - { platform: devto, user_name: "jekyll", user_url: "https://dev.to/jekyll" }
122178
# - { platform: dribbble, user_name: "jekyll", user_url: "https://dribbble.com/jekyll" }
@@ -134,3 +190,12 @@ optima:
134190
# - { platform: telegram, user_name: "jekyll", user_url: "https://t.me/jekyll" }
135191
- { platform: twitter, user_name: "@jekyllrb", user_url: "https://twitter.com/jekyllrb" }
136192
# - { platform: youtube, user_name: "jekyll", user_url: "https://www.youtube.com/jekyll" }
193+
194+
# Generate other links in footer.
195+
#
196+
other_links_title: "Elsewhere"
197+
other_links:
198+
# - { site_name: "briandrum.com", site_url: "https://briandrum.com" }
199+
- { site_name: "councilmandrum.net", site_url: "https://councilmandrum.net" }
200+
- { site_name: "sugarandfrogs.com", site_url: "https://www.sugarandfrogs.com" }
201+
- { site_name: "codes.forchagrin.com", site_url: "https://codes.forchagrin.com" }

‎_includes/entry.html

+14-7
Original file line numberDiff line numberDiff line change
@@ -3,21 +3,28 @@
33
<div class="Entry-published">
44
<time class="dt-published" datetime="{{ include.date | date_to_xmlschema }}" itemprop="datePublished">
55
<a class="Entry-publishedLink u-url" href="{{ include.url | relative_url }}">
6-
{{ include.date | date:site.optima.time_and_date_short_format }}
6+
{{ include.date | date:site.optima.date_long_format }}
77
</a>
88
</time>
99
</div>
1010
<h1 class="Entry-title">
11-
<a class="Entry-titleLink u-url" href="{{ include.url | relative_url }}">
12-
{{ include.title |smartify }}
13-
</a>
11+
{%- if include.mode == "excerpt" -%}
12+
<a class="Entry-titleLink u-url" href="{{ include.url | relative_url }}">
13+
{{ include.title |smartify }}
14+
</a>
15+
{%- else if include.mode == "content" -%}
16+
<span class="Entry-titleLink u-url">
17+
{{ include.title |smartify }}
18+
</span>
19+
{%- endif -%}
1420
</h1>
1521
</header>
1622
<div class="Entry-content e-content">
17-
{%- if include.mode == "excerpt" -%}
18-
{{ include.excerpt | markdownify }}
19-
{%- else if include.mode == "content" -%}
23+
{%- if include.mode == "content" -%}
2024
{{ include.content | markdownify }}
25+
{%- else if include.mode == "excerpt" -%}
26+
{{ include.description | markdownify }}
27+
{{ include.excerpt | markdownify }}
2128
{%- endif -%}
2229
</div>
2330
<footer class="Entry-footer">

‎_includes/footer.html

+26-12
Original file line numberDiff line numberDiff line change
@@ -5,20 +5,11 @@
55
{%- assign titles_size = site.pages | map: 'title' | join: '' | size -%}
66
<div class="Footer-content">
77
<div class="Footer-about">
8-
<p><strong><a class="Footer-link" rel="author" href="{{ "/" | relative_url }}">{{ site.title | smartify }}</a></strong></p>
8+
<h1 class="Footer-heading">{{ site.optima.description_title }}</h1>
99
<p>{{ site.description | smartify }}</p>
10-
<ul class="Footer-navList">
11-
<li class="Footer-navListItem">
12-
<a class="Footer-link Footer-link--withIcon" href="{{ 'feed.xml' | relative_url }}">
13-
<svg class="Footer-linkIcon Icon">
14-
<use xlink:href="{{ 'assets/optima-social-icons.svg#rss' | relative_url }}"></use>
15-
</svg>
16-
<span>Subscribe</span>
17-
</a>
18-
</li>
19-
</ul>
2010
</div>
2111
<div class="Footer-nav">
12+
<h1 class="Footer-heading">{{ site.optima.footer_pages_title }}</h1>
2213
<ul class="Footer-navList">
2314
{%- for path in page_paths -%}
2415
{%- assign my_page = site.pages | find_exp: "page", "page.path == path or page.pagination.category == path" -%}
@@ -38,7 +29,30 @@
3829
</ul>
3930
</div>
4031
<div class="Footer-social">
41-
{%- include social/social.html -%}
32+
<h1 class="Footer-heading">{{ site.optima.social_links_title }}</h1>
33+
<ul class="Footer-navList">
34+
{%- if site.plugins contains "jekyll-feed" -%}
35+
<li class="Footer-navListItem">
36+
<a class="Footer-link Footer-link--withIcon" href="{{ 'feed.xml' | absolute_url }}">
37+
<svg class="Footer-linkIcon Icon">
38+
<use xlink:href="{{ 'assets/optima-social-icons.svg#rss' | relative_url }}"></use>
39+
</svg>
40+
<span>{{ 'feed.xml' | absolute_url | remove_first: "https" | remove_first: "http" | remove_first: "://" }}</span>
41+
</a>
42+
</li>
43+
{%- endif -%}
44+
{%- include social/social.html -%}
45+
</ul>
46+
</div>
47+
<div class="Footer-other">
48+
<h1 class="Footer-heading">{{ site.optima.other_links_title }}</h1>
49+
<ul class="Footer-navList">
50+
{%- for other_link in site.optima.other_links -%}
51+
<li class="Footer-navListItem">
52+
<a class="Footer-link" href="{{ other_link.site_url }}">{{ other_link.site_name }}</a>
53+
</li>
54+
{%- endfor -%}
55+
</ul>
4256
</div>
4357
</div>
4458
<div>

‎_includes/head-feed.html

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
{% comment %}
2+
jekyll-feed plugin
3+
{% endcomment %}
4+
5+
{%- feed_meta -%}

‎_includes/head.html

+3-1
Original file line numberDiff line numberDiff line change
@@ -21,5 +21,7 @@
2121

2222
{%- include head-custom.html -%}
2323

24-
{%- feed_meta -%}
24+
{%- if site.plugins contains "jekyll-feed" -%}
25+
{%- include head-feed.html -%}
26+
{%- endif -%}
2527
</head>

‎_includes/social/social.html

-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
<ul class="Footer-navList">
21
{%- for entry in site.optima.social_links -%}
32
{%- include social/social-item.html item = entry -%}
43
{%- endfor -%}
5-
</ul>

‎_layouts/archive-tag.html

+5-7
Original file line numberDiff line numberDiff line change
@@ -2,24 +2,22 @@
22
layout: default
33
---
44

5-
<div class="ArchivesLayout NotesLayout">
5+
<div class="ArchivesLayout">
66
{%- if page.title -%}
7-
<h1 class="ArchivesLayout-title">Archive of posts with {{ page.type }} ‘{{ page.title }}’</h1>
7+
<h1 class="ArchivesLayout-title">Archive of everything with {{ page.type }} ‘{{ page.title }}’</h1>
88
{%- endif -%}
99

1010
{{ content }}
1111

1212
{% for post in page.posts %}
1313
{%- if post.categories.first == "notes" -%}
14-
<section class="NotesLayout-note">
14+
<section class="ArchivesLayout-note">
1515
{% include note.html slug=post.slug content=post.content date=post.date size="medium" tags=post.tags url=post.url %}
1616
</section>
17-
{%- comment -%}
1817
{%- elsif post.categories.first == "journal" -%}
19-
<section class="NotesLayout-note">
20-
{% include entry.html slug=post.slug content=post.content date=post.date size="small" tags=post.tags url=post.url title=post.title %}
18+
<section class="ArchivesLayout-entry">
19+
{% include entry.html content=post.content date=post.date description=post.description excerpt=post.excerpt mode="excerpt" size="" slug=post.slug tags=post.tags title=post.title url=post.url %}
2120
</section>
22-
{%- endcomment -%}
2321
{%- endif -%}
2422
{% endfor %}
2523
</div>

‎_layouts/archive-year.html

+22-7
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,28 @@
22
layout: default
33
---
44

5-
<h1>Archive of posts from {{ page.date | date: "%Y" }}</h1>
5+
<div class="ArchivesLayout">
6+
{%- if page.title -%}
7+
<h1>Archive of posts from {{ page.date | date: "%Y" }}</h1>
8+
{%- endif -%}
9+
10+
{{ content }}
611

7-
<ul class="posts">
812
{% for post in page.posts %}
9-
<li>
10-
<span class="post-date">{{ post.date | date: "%b %-d, %Y" }}</span>
11-
<a class="post-link" href="{{ post.url | relative_url }}">{{ post.title }}</a>
12-
</li>
13+
{%- if post.categories.first == "articles" -%}
14+
<section class="ArchivesLayout-article">
15+
{% include entry.html content=post.content date=post.date description=post.description excerpt=post.excerpt mode="excerpt" size="" slug=post.slug tags=post.tags title=post.title url=post.url %}
16+
</section>
17+
{%- endif -%}
18+
{%- if post.categories.first == "journal" -%}
19+
<section class="ArchivesLayout-entry">
20+
{% include entry.html content=post.content date=post.date description=post.description excerpt=post.excerpt mode="excerpt" size="" slug=post.slug tags=post.tags title=post.title url=post.url %}
21+
</section>
22+
{%- endif -%}
23+
{%- if post.categories.first == "notes" -%}
24+
<section class="ArchivesLayout-note">
25+
{% include note.html slug=post.slug content=post.content date=post.date size="medium" tags=post.tags url=post.url %}
26+
</section>
27+
{%- endif -%}
1328
{% endfor %}
14-
</ul>
29+
</div>

‎_layouts/entry.html

+9-6
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,18 @@
1919
{%- endfor -%}
2020

2121
<div class="EntryLayout">
22-
{%- if category -%}
22+
{%- comment -%}
23+
{%- if category -%}
2324
<div class="EntryLayout-title">{{ category | capitalize }}</div>
24-
{%- endif -%}
25+
{%- endif -%}
26+
{%- endcomment -%}
27+
28+
{% include entry.html content=page.content date=page.date description=page.description excerpt=page.excerpt mode="content" size="large" slug=page.slug tags=page.tags title=page.title url=page.url %}
2529

2630
<nav class="EntryLayout-nav">
27-
<ol>
31+
<ul>
2832
<li class="EntryLayout-navItem">
29-
<a href={{ "/journal/" | relative_url }}>Journal</a>
33+
<a href={{ "/journal/" | relative_url }}>{{ category | capitalize }}</a>
3034
</li>
3135
<li class="EntryLayout-navItem EntryLayout-navItem--older">
3236
{%- if older_entry -%}
@@ -42,7 +46,6 @@
4246
<span class="EntryLayout-navItemContent">Newer</span>
4347
{%- endif -%}
4448
</li>
45-
</ol>
49+
</ul>
4650
</nav>
47-
{% include entry.html content=page.content date=page.date excerpt=page.excerpt mode="content" size="small" slug=page.slug tags=page.tags title=page.title url=page.url %}
4851
</div>

‎_layouts/journal.html

+19-16
Original file line numberDiff line numberDiff line change
@@ -3,30 +3,33 @@
33
---
44

55
<div class="JournalLayout">
6-
{%- if page.title -%}
7-
<h1 class="JournalLayout-title">{{ page.title }}</h1>
8-
{%- endif -%}
6+
{%- comment -%}
7+
{%- if page.title -%}
8+
<h1 class="JournalLayout-title">{{ page.title }}</h1>
9+
{%- endif -%}
10+
{%- endcomment -%}
911

1012
{{ content | markdownify }}
1113

14+
<nav class="JournalLayout-nav">
15+
{% if paginator.previous_page %}
16+
<a class="JournalLayout-navContent" href="{{ paginator.previous_page_path | relative_url }}">View newer entries</a>
17+
{%- else -%}
18+
<span class="JournalLayout-navContent">Viewing the most recent journal entries</span>
19+
{% endif %}
20+
</nav>
21+
1222
{% for entry in paginator.posts %}
1323
<section class="JournalLayout-entry">
14-
{% include entry.html content=entry.content date=entry.date excerpt=entry.excerpt mode="excerpt" size="small" slug=entry.slug tags=entry.tags title=entry.title url=entry.url %}
24+
{% include entry.html content=entry.content date=entry.date description=entry.description excerpt=entry.excerpt mode="excerpt" size="small" slug=entry.slug tags=entry.tags title=entry.title url=entry.url %}
1525
</section>
1626
{% endfor %}
1727

18-
{% if paginator.total_pages > 1 %}
19-
<ul>
20-
{% if paginator.previous_page %}
21-
<li>
22-
<a href="{{ paginator.previous_page_path | prepend: site.baseurl }}">Newer</a>
23-
</li>
24-
{% endif %}
28+
<nav class="JournalLayout-nav">
2529
{% if paginator.next_page %}
26-
<li>
27-
<a href="{{ paginator.next_page_path | prepend: site.baseurl }}">Older</a>
28-
</li>
30+
<a class="JournalLayout-navContent" href="{{ paginator.next_page_path | relative_url }}">View older journal entries</a>
31+
{%- else -%}
32+
<span class="JournalLayout-navContent">You've reached the end!</span>
2933
{% endif %}
30-
</ul>
31-
{% endif %}
34+
</nav>
3235
</div>

0 commit comments

Comments
 (0)