From 21c25413fcfeaa5e425378d97e0af39e118bf8ce Mon Sep 17 00:00:00 2001 From: Tanner Collin Date: Fri, 9 Apr 2021 05:17:51 +0000 Subject: [PATCH] Support setting an article as "wide" --- themes/theme/templates/article.html | 44 ++++++++++++------- themes/theme/templates/base.html | 26 +++++------- themes/theme/templates/index.html | 66 ++++++++++++++++------------- themes/theme/templates/style.css | 4 ++ 4 files changed, 79 insertions(+), 61 deletions(-) diff --git a/themes/theme/templates/article.html b/themes/theme/templates/article.html index 9bb8097..36641ef 100644 --- a/themes/theme/templates/article.html +++ b/themes/theme/templates/article.html @@ -32,21 +32,33 @@ {% endblock %} {% block content %} -

← Return to Home

-
-

{{ article.title }}

-
- {{ article.summary }} + + {% if article.wide %} +
+ {% else %} +
+ {% endif %} + +
+ {{ info() }} +
+ +

← Return to Home

+
+

{{ article.title }}

+
+ {{ article.summary }} +
+

+ {{ article.locale_date }} + {% if article.modified %} + — updated {{ article.locale_modified }} + {% endif %} +

+
+
+
+ {{ article.content }} +
-

- {{ article.locale_date }} - {% if article.modified %} - — updated {{ article.locale_modified }} - {% endif %} -

-
-
-
- {{ article.content }} -
{% endblock %} diff --git a/themes/theme/templates/base.html b/themes/theme/templates/base.html index da9f6c0..aeeb818 100644 --- a/themes/theme/templates/base.html +++ b/themes/theme/templates/base.html @@ -44,27 +44,23 @@ -{% if PROD %} - -{% else %} - -{% endif %} + {% if PROD %} + + {% else %} + + {% endif %} -{%- macro info() -%} - {% block info %}{% endblock %} -{%- endmacro -%} + {%- macro info() -%} + {% block info %}{% endblock %} + {%- endmacro -%}
{{ info() }}
-
-
- {{ info() }} -
- {% block content %} - {% endblock %} -
+ + {% block content %} + {% endblock %}

diff --git a/themes/theme/templates/index.html b/themes/theme/templates/index.html index 7d9f873..ab6266a 100644 --- a/themes/theme/templates/index.html +++ b/themes/theme/templates/index.html @@ -23,42 +23,48 @@ {% endblock %} {% block content %} -

- Hi, I'm Tanner! I do firmware and web development in Calgary. -

+
-

Contact Info

+
+ {{ info() }} +
-

- Email: site2@tannercollin.com
- Telegram: @tannercollin -

+

+ Hi, I'm Tanner! I do firmware and web development in Calgary. +

-

Resume

+

Contact Info

- +

+ Email: site2@tannercollin.com
+ Telegram: @tannercollin +

-

Projects

+

Resume

-

- My main hobby is working on technical projects. I typically design websites or - build tools that make my life easier. Sometimes art. -

+ -

- You can find my code on GitHub. -

+

Projects

-{% for article in articles_page.object_list if article.category.name == 'Projects' %} -

{{ article.title }}

-
- {{ article.summary }} -
-{% endfor %} +

+ My main hobby is working on technical projects. I typically design websites or + build tools that make my life easier. Sometimes art. +

+ +

+ You can find my code on GitHub. +

+ + {% for article in articles_page.object_list if article.category.name == 'Projects' %} +

{{ article.title }}

+
+ {{ article.summary }} +
+ {% endfor %} {% endblock %} diff --git a/themes/theme/templates/style.css b/themes/theme/templates/style.css index 868d004..1dc9889 100644 --- a/themes/theme/templates/style.css +++ b/themes/theme/templates/style.css @@ -135,6 +135,10 @@ pre { max-width: 36rem; } +.content-wide { + max-width: none; +} + .content p { font: 1.2rem/1.5 Apparatus SIL,serif; }