diff --git a/README.md b/README.md index c4473ed..cb89033 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,4 @@ -# theme-jeffmackinnon.com - - +# Jeff's Pelican SSG Theme The base pelican theme for my site, [jeffmackinnon.com](https://jeffmackinnon.com) @@ -101,6 +99,7 @@ In order of percieved importance, but not in the order that I will get them done - [ ] Make installable - [X] Create custom colours - [ ] Figure out how to create a Dark Mode +- [ ] Add paths for the .html files so I can take them out of the theme themselves. ### Roadmap notes diff --git a/static/css-include/colour-default.css b/static/css-include/colour-default.css index b1b8715..21965ff 100644 --- a/static/css-include/colour-default.css +++ b/static/css-include/colour-default.css @@ -1,5 +1,5 @@ /* - Deffault Colours + Default Colours */ :root { diff --git a/static/css/main.css b/static/css/main.css index 7924e53..aef4ef0 100644 --- a/static/css/main.css +++ b/static/css/main.css @@ -3,14 +3,6 @@ @import url(../css-include/pygment.css); @import url(../css-include/pelican.css); - -/* - Some site colours -*/ - - - - /* Editorial by HTML5 UP html5up.net | @ajlkn diff --git a/templates/archives.html b/templates/archives.html index 9462fd2..2397e16 100644 --- a/templates/archives.html +++ b/templates/archives.html @@ -5,10 +5,6 @@ {% block content %}

Archives for {{ SITENAME }}

-
- {% for article in dates %} -
{{ article.locale_date }}
-
{{ article.title }}
-{% endfor %} -
+{% include 'include/archive_list.html' %} + {% endblock %} diff --git a/templates/article.html b/templates/article.html index 589adf3..2855f70 100644 --- a/templates/article.html +++ b/templates/article.html @@ -5,6 +5,12 @@ {% block title %}{{ SITENAME }} - {{ article.title|striptags }}{% endblock %} {% block head %} +{% if article.status == "hidden" %} + + + +{% endif %} + {{ super() }} {% import 'translations.html' as translations with context %} {% if translations.entry_hreflang(article) %} @@ -128,7 +134,7 @@ - {% if COMMENTS is sameas True %}

Comments

diff --git a/templates/article_infos.html b/templates/article_infos.html deleted file mode 100644 index 172ad85..0000000 --- a/templates/article_infos.html +++ /dev/null @@ -1,23 +0,0 @@ - diff --git a/templates/base.html b/templates/base.html index da18d02..7599b47 100644 --- a/templates/base.html +++ b/templates/base.html @@ -2,7 +2,7 @@ {% block head %} - {% if NASHOSTED %}NAS Hosted - {% endif %}{% block title %}{{ SITENAME }}{% endblock title %} + {% block title %}{{ SITENAME }}{% endblock title %} {% if FAVICON %} {% endif %} diff --git a/templates/gosquared.html b/templates/gosquared.html deleted file mode 100644 index 49ccbbe..0000000 --- a/templates/gosquared.html +++ /dev/null @@ -1,14 +0,0 @@ -{% if GOSQUARED_SITENAME %} - -{% endif %} diff --git a/templates/include/archive_list.html b/templates/include/archive_list.html new file mode 100644 index 0000000..06d3969 --- /dev/null +++ b/templates/include/archive_list.html @@ -0,0 +1,6 @@ +
+ {% for article in dates %} +
{{ article.locale_date }}
+
{{ article.title }}
+{% endfor %} +
\ No newline at end of file diff --git a/templates/include/paginated_posts.html b/templates/include/paginated_posts.html index b7b7223..d6a7775 100644 --- a/templates/include/paginated_posts.html +++ b/templates/include/paginated_posts.html @@ -40,6 +40,6 @@
{% if articles_page.has_other_pages() %} - {% include 'pagination.html' %} + {% include 'include/pagination.html' %} {% endif %}
\ No newline at end of file diff --git a/templates/pagination.html b/templates/include/pagination.html similarity index 100% rename from templates/pagination.html rename to templates/include/pagination.html diff --git a/templates/include/sidebar.html b/templates/include/sidebar.html index a237b06..c2a7f86 100644 --- a/templates/include/sidebar.html +++ b/templates/include/sidebar.html @@ -160,6 +160,20 @@ {% endif %} + {% if THEME_DARKMODE == 1 %} + +
+ +
+ + {% endif %} + +