From 5bcad7eb77ace87e3776c9ba77673772de0aa872 Mon Sep 17 00:00:00 2001 From: Tanner Collin Date: Sun, 30 May 2021 05:00:35 +0000 Subject: [PATCH] Fix duplicate sidebar / topbar problem --- themes/theme/templates/article.html | 9 +- themes/theme/templates/base.html | 9 +- themes/theme/templates/index.html | 5 -- themes/theme/templates/style.css | 131 +++++++++++++--------------- 4 files changed, 70 insertions(+), 84 deletions(-) diff --git a/themes/theme/templates/article.html b/themes/theme/templates/article.html index 36641ef..9b51825 100644 --- a/themes/theme/templates/article.html +++ b/themes/theme/templates/article.html @@ -26,6 +26,11 @@ {% block info %} Tanner Collin +

+ email + telegram + github +

Light / Dark

@@ -39,10 +44,6 @@
{% endif %} -
- {{ info() }} -
-

← Return to Home

{{ article.title }}

diff --git a/themes/theme/templates/base.html b/themes/theme/templates/base.html index 3417d13..e39f30c 100644 --- a/themes/theme/templates/base.html +++ b/themes/theme/templates/base.html @@ -52,13 +52,10 @@ {% endif %} - {%- macro info() -%} - {% block info %}{% endblock %} - {%- endmacro -%} -
-
- {{ info() }} +
+ {% block info %} + {% endblock %}
{% block content %} diff --git a/themes/theme/templates/index.html b/themes/theme/templates/index.html index f0527be..53c5aa7 100644 --- a/themes/theme/templates/index.html +++ b/themes/theme/templates/index.html @@ -24,11 +24,6 @@ {% block content %}
- -
- {{ info() }} -
-

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

diff --git a/themes/theme/templates/style.css b/themes/theme/templates/style.css index e19bc64..fe6d1d6 100644 --- a/themes/theme/templates/style.css +++ b/themes/theme/templates/style.css @@ -52,71 +52,6 @@ pre { cursor: pointer; } -.sidebar { - margin-top: 2px; - float: left; - width: 8rem; - text-align: right; -} - -.sidebar .me { - width: 100%; - display: block; -} - -.sidebar .info { - margin-top: 2rem; -} - -.sidebar .contact-icons a { - border-bottom: none; -} - -.sidebar .contact-icons img { - width: 1.25rem; - height: 1.25rem; - margin-left: 0.5rem; -} - -.topbar { - display: table; - overflow: auto; - margin: auto; - margin-top: -0.5rem; - font-size: 1.5rem; -} - -.topbar .me { - float: left; - height: 6.5rem; - width: auto; -} - -.topbar .info { - float: left; - margin-top: -0.25rem; - margin-left: 1.5rem; -} - -.topbar .contact-icons { - margin-left: 0.25rem; - margin-bottom: 0; -} - -.topbar .contact-icons a { - border-bottom: none; -} - -.topbar .contact-icons img { - width: 1.5rem; - height: 1.5rem; - margin-right: 1rem; -} - -.topbar .theme-select { - margin-top: 0.5rem; -} - .toc { float: right; padding: 0.75rem; @@ -186,14 +121,72 @@ pre { .content { margin-left: 10rem; } - .topbar { - display: none; + + .bar { + margin-top: 2px; + float: left; + width: 8rem; + text-align: right; + } + + .bar .me { + width: 100%; + display: block; + } + + .bar .info { + margin-top: 2rem; + } + + .bar .contact-icons a { + border-bottom: none; + } + + .bar .contact-icons img { + width: 1.25rem; + height: 1.25rem; + margin-left: 0.5rem; } } @media screen and (max-width:36rem) { - .sidebar { - display: none; + .bar { + display: table; + overflow: auto; + margin: auto; + margin-top: -0.5rem; + } + + .bar .me { + float: left; + height: 6.5rem; + width: auto; + } + + .bar .info { + float: left; + margin-top: -0.25rem; + margin-left: 1.5rem; + } + + .bar .contact-icons { + margin-top: 1rem; + margin-left: 0.25rem; + margin-bottom: 0; + } + + .bar .contact-icons a { + border-bottom: none; + } + + .bar .contact-icons img { + width: 1.5rem; + height: 1.5rem; + margin-right: 1rem; + } + + .bar .theme-select { + margin-top: 0.5rem; } }