diff --git a/sass/layouts/_footer.scss b/sass/layouts/_footer.scss index 82d35ce5038e72b0749b83cdf61307cf16d7abf0..f66e317679e36a523aeeea10f0dc65f861a21e45 100644 --- a/sass/layouts/_footer.scss +++ b/sass/layouts/_footer.scss @@ -1,8 +1,13 @@ footer { width: 100%; + position: relative; + bottom: 0; + padding-top: 0.25rem; + padding-bottom: 0.25rem; background-color: var(--white); border-top: 1px solid; border-color: $dark1; + font-size: 16px; color: var(--black); ul { display: flex; diff --git a/templates/404.html b/templates/404.html index b6e7e095566b166e5e42d2a4a51ff453ebc5c09c..29058c967292987e9a5f36a0cec506f3304b80d0 100644 --- a/templates/404.html +++ b/templates/404.html @@ -1,7 +1,9 @@ -{% extends 'base.html' %} {% block styles %} {{ -macros::styles(file='section.css') }} {% endblock styles %} {% block htmltitle -%} 404 Page Not Found {% endblock htmltitle %} {% block header %} -{{macros::header(current_url="/")}} {% endblock header %} {% block content %} +{% extends 'base.html' %} +{% block styles %} {{macros::styles(file='section.css') }} {% endblock styles %} +{% block htmltitle%} 404 Page Not Found {% endblock htmltitle %} +{# set specifically so that there are no problems #} +{% block header %} {{macros::header(current_url="/")}} {% endblock header %} +{% block content %} <div class="error"> <h1>404</h1> <h2>Page Not Found</h2> diff --git a/templates/page.html b/templates/page.html index ef88b6923b1981a1e1e3add502866f0327327da0..7c449a0bfea12a20ab02a9ce79e8d339cb9abd77 100644 --- a/templates/page.html +++ b/templates/page.html @@ -1,6 +1,8 @@ -{% extends "base.html" %} {% block styles %} {{ macros::styles(file='page.css') -}} {% endblock styles %} {% block htmltitle %} {{ page.title }} {% endblock -htmltitle %} {% block content %} +{% extends "base.html" %} +{# import styles for page #} +{% block styles %} {{ macros::styles(file='page.css')}} {% endblock styles %} +{% block htmltitle %} {{ page.title }} {% endblock htmltitle %} +{% block content %} <main> <div class="show-bar"> <a href="#sidebar" class="sidebar" role="button" x-data="{ open:false}"> @@ -37,11 +39,14 @@ htmltitle %} {% block content %} <h1 class="title">{{ page.title }}</h1> {% block sections %} <ul class="sections"> - {{ page_macros::relative_path() }} {{ page_macros::word_count() }} {{ - page_macros::reading_time() }} {{ page_macros::date() }} {{ - page_macros::taxonomies_authors() }} + {{ page_macros::relative_path() }} + {{ page_macros::word_count() }} + {{ page_macros::reading_time() }} + {{ page_macros::date() }} + {{ page_macros::taxonomies_authors() }} </ul> - {% endblock sections %} {{ page.content | safe }} + {% endblock sections %} + {{ page.content | safe }} </article> {{ page_macros::toc(page=page) }} </main> diff --git a/templates/section.html b/templates/section.html index 98484906354fbaf55f34b2a0c87ba2f313eb20e7..dfb11dcf0d2c588147828ed2f87192dfb3383cc6 100644 --- a/templates/section.html +++ b/templates/section.html @@ -1,9 +1,9 @@ -{% extends "base.html" %} {% block styles %} {{ -macros::styles(file='section.css') }} {% endblock styles %} {% block htmltitle -%} {{ macros::title_or_last(component=section) }} - {{ config.title }} {% -endblock htmltitle %} {% block title %} {{ -macros::title_or_last(component=section) }} {% endblock title %} {% block math -%} {{ macros::math() }} {% endblock math %} {% block content %} +{% extends "base.html" %} +{% block styles %} {{macros::styles(file='section.css') }} {% endblock styles %} +{% block htmltitle%} {{ macros::title_or_last(component=section) }} - {{ config.title }} {%endblock htmltitle %} +{% block title %} {{macros::title_or_last(component=section) }} {% endblock title %} +{% block math%} {{ macros::math() }} {% endblock math %} +{% block content %} <section> {% for page in section.pages %} <a href="{{ page.permalink }}">