From 3e0aa30b2a86ebe7f0f7d4be85ec7cf149d27569 Mon Sep 17 00:00:00 2001 From: jem Date: Sat, 22 Feb 2020 13:38:41 +0100 Subject: [PATCH] cleanup & add newest fixes --- .../themes/bootstrap4/css/custom.css | 2 +- .../themes/bootstrap4/html/archives.html | 10 ++++++ .../themes/bootstrap4/html/base.html | 32 ++++++------------ .../bootstrap4/html/custom/content-header.inc | 0 .../themes/bootstrap4/html/custom/footer.inc | 2 +- .../bootstrap4/html/custom/navbar-logo.inc | 6 ++-- .../bootstrap4/html/custom/navbar-social.inc | 20 ++++++----- .../html/custom/site-navigation.inc | 8 ++--- .../bootstrap4/html/custom/site-partner.inc | 2 ++ .../html/custom/site-we-support.inc | 2 ++ .../themes/bootstrap4/html/custom/sites.inc | 1 + .../bootstrap4/html/custom/tracking.inc | 27 ++------------- .../bootstrap4/html/includes/latest-posts.inc | 8 ----- .../bootstrap4/html/includes/post-latest.inc | 10 ++++++ .../bootstrap4/html/includes/post-tags.inc | 10 ++++++ .../themes/bootstrap4/html/includes/tags.inc | 12 ------- .../bootstrap4/html/page-one-column.html | 5 ++- .../bootstrap4/html/page-three-column.html | 5 ++- .../bootstrap4/html/page-two-column.html | 3 +- .../img/theme/acme_auto_1906_logo.jpg | Bin 0 -> 33354 bytes 20 files changed, 76 insertions(+), 89 deletions(-) create mode 100644 resources/templates/themes/bootstrap4/html/custom/content-header.inc create mode 100644 resources/templates/themes/bootstrap4/html/custom/site-partner.inc create mode 100644 resources/templates/themes/bootstrap4/html/custom/site-we-support.inc create mode 100644 resources/templates/themes/bootstrap4/html/custom/sites.inc delete mode 100644 resources/templates/themes/bootstrap4/html/includes/latest-posts.inc create mode 100644 resources/templates/themes/bootstrap4/html/includes/post-latest.inc create mode 100644 resources/templates/themes/bootstrap4/html/includes/post-tags.inc delete mode 100644 resources/templates/themes/bootstrap4/html/includes/tags.inc create mode 100644 resources/templates/themes/bootstrap4/img/theme/acme_auto_1906_logo.jpg diff --git a/resources/templates/themes/bootstrap4/css/custom.css b/resources/templates/themes/bootstrap4/css/custom.css index cef527d..d6a3b27 100644 --- a/resources/templates/themes/bootstrap4/css/custom.css +++ b/resources/templates/themes/bootstrap4/css/custom.css @@ -24,7 +24,7 @@ html, body { } .below-nav { - margin-top: 68px; + margin-top: 0px; } .carousel-adjust { diff --git a/resources/templates/themes/bootstrap4/html/archives.html b/resources/templates/themes/bootstrap4/html/archives.html index 887f9e5..94f75e4 100644 --- a/resources/templates/themes/bootstrap4/html/archives.html +++ b/resources/templates/themes/bootstrap4/html/archives.html @@ -3,3 +3,13 @@ {% block center %} {% include "/html/includes/groups.inc" %} {% endblock %} + +{% block right %} +

 

+ {% include "/html/custom/sites.inc" %} +

 

+ {% include "/html/includes/post-latest.inc" %} +

 

+ {% include "/html/includes/post-tags.inc" %} +

 

+{% endblock %} diff --git a/resources/templates/themes/bootstrap4/html/base.html b/resources/templates/themes/bootstrap4/html/base.html index 03d45e3..d17634a 100644 --- a/resources/templates/themes/bootstrap4/html/base.html +++ b/resources/templates/themes/bootstrap4/html/base.html @@ -11,8 +11,8 @@ {{title}}{% block subtitle %}{% endblock %} - {% style "/css/bootstrap.min.css" %} - {% style "/css/fonts/fontawesome/fontawesome.css" %} + {% style "/css/bootstrap.min.css" %} + {% style "/css/fonts/fontawesome/fontawesome.css" %} {% style "/css/custom.css" %} {% block additional_styles %} {% endblock %} @@ -22,7 +22,10 @@ {% include "/html/custom/topper.inc" %}