tanner/personal-site
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Support setting an article as "wide"

Browse Source
This commit is contained in:
Tanner Collin 2021-04-09 05:17:51 +00:00
parent 3e0e0beb0f
commit 21c25413fc
4 changed files with 79 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
themes/theme/templates/article.html
View File

@ -32,8 +32,19 @@
{% endblock %} {% endblock %}
{% block content %} {% block content %}
<p><a href="/">← Return to Home</a></p>
<header> {% if article.wide %}
<div class="content content-wide">
{% else %}
<div class="content">
{% endif %}
<div class="topbar">
{{ info() }}
</div>
<p><a href="/">← Return to Home</a></p>
<header>
<h1>{{ article.title }}</h1> <h1>{{ article.title }}</h1>
<div class="summary"> <div class="summary">
{{ article.summary }} {{ article.summary }}
@ -44,9 +55,10 @@
— updated {{ article.locale_modified }} — updated {{ article.locale_modified }}
{% endif %} {% endif %}
</p> </p>
</header> </header>
<hr /> <hr />
<article> <article>
{{ article.content }} {{ article.content }}
</article> </article>
</div>
{% endblock %} {% endblock %}

16
themes/theme/templates/base.html
View File

@ -44,28 +44,24 @@
</noscript> </noscript>
</head> </head>
{% if PROD %} {% if PROD %}
<body class="<?php echo $themeClass; ?>"> <body class="<?php echo $themeClass; ?>">
{% else %} {% else %}
<body> <body>
{% endif %} {% endif %}
{%- macro info() -%} {%- macro info() -%}
{% block info %}{% endblock %} {% block info %}{% endblock %}
{%- endmacro -%} {%- endmacro -%}
<div class="container"> <div class="container">
<div class="sidebar"> <div class="sidebar">
{{ info() }} {{ info() }}
</div> </div>
<div class="content">
<div class="topbar">
{{ info() }}
</div>
{% block content %} {% block content %}
{% endblock %} {% endblock %}
</div> </div>
</div>
<p class="copyright"> <p class="copyright">
© 2012–2021 Tanner Collin © 2012–2021 Tanner Collin

42
themes/theme/templates/index.html
View File

@ -23,42 +23,48 @@
{% endblock %} {% endblock %}
{% block content %} {% block content %}
<p> <div class="content">
<div class="topbar">
{{ info() }}
</div>
<p>
Hi, I'm Tanner! I do firmware and web development in Calgary. Hi, I'm Tanner! I do firmware and web development in Calgary.
</p> </p>
<h2>Contact Info</h2> <h2>Contact Info</h2>
<p> <p>
Email: <a href="mailto:site2@tannercollin.com">site2@tannercollin.com</a> <br /> Email: <a href="mailto:site2@tannercollin.com">site2@tannercollin.com</a> <br />
Telegram: <a href="https://t.me/tannercollin" target="_blank" rel="noreferrer noopener">@tannercollin</a> Telegram: <a href="https://t.me/tannercollin" target="_blank" rel="noreferrer noopener">@tannercollin</a>
</p> </p>
<h2>Resume</h2> <h2>Resume</h2>
<ul> <ul>
<li>Firmware Engineer at <a href="https://cabanablockchain.com" target="_blank" rel="noreferrer noopener">Cabana Blockchain</a>, 2018–</li> <li>Firmware Engineer at <a href="https://cabanablockchain.com" target="_blank" rel="noreferrer noopener">Cabana Blockchain</a>, 2018–</li>
<li>Lead Hardware Engineer at <a href="https://criticalcontrol.com/" target="_blank" rel="noreferrer noopener">Critical Control</a>, 2016–2018</li> <li>Lead Hardware Engineer at <a href="https://criticalcontrol.com/" target="_blank" rel="noreferrer noopener">Critical Control</a>, 2016–2018</li>
<li>Electrical Engineer at <a href="https://www.opener.aero/" target="_blank" rel="noreferrer noopener">Opener Aero</a>, 2016–2016</li> <li>Electrical Engineer at <a href="https://www.opener.aero/" target="_blank" rel="noreferrer noopener">Opener Aero</a>, 2016–2016</li>
<li>Electrical Engineer Intern at <a href="https://www.pason.com/" target="_blank" rel="noreferrer noopener">Pason Systems</a>, 2014–2015</li> <li>Electrical Engineer Intern at <a href="https://www.pason.com/" target="_blank" rel="noreferrer noopener">Pason Systems</a>, 2014–2015</li>
<li>BSc. Electrical Engineering from University of Calgary</li> <li>BSc. Electrical Engineering from University of Calgary</li>
</ul> </ul>
<h2>Projects</h2> <h2>Projects</h2>
<p> <p>
My main hobby is working on technical projects. I typically design websites or My main hobby is working on technical projects. I typically design websites or
build tools that make my life easier. Sometimes art. build tools that make my life easier. Sometimes art.
</p> </p>
<p> <p>
You can find my code on <a href="https://github.com/tannercollin" target="_blank" rel="noreferrer noopener">GitHub</a>. You can find my code on <a href="https://github.com/tannercollin" target="_blank" rel="noreferrer noopener">GitHub</a>.
</p> </p>
{% for article in articles_page.object_list if article.category.name == 'Projects' %} {% for article in articles_page.object_list if article.category.name == 'Projects' %}
<h3><a href="{{ article.url }}">{{ article.title }}</a></h3> <h3><a href="{{ article.url }}">{{ article.title }}</a></h3>
<div class="summary"> <div class="summary">
{{ article.summary }} {{ article.summary }}
</div> </div>
{% endfor %} {% endfor %}
{% endblock %} {% endblock %}

4
themes/theme/templates/style.css
View File

@ -135,6 +135,10 @@ pre {
max-width: 36rem; max-width: 36rem;
} }
.content-wide {
max-width: none;
}
.content p { .content p {
font: 1.2rem/1.5 Apparatus SIL,serif; font: 1.2rem/1.5 Apparatus SIL,serif;
} }