From bfa11ba4fc5241095d9c253c30d976ddf213545c Mon Sep 17 00:00:00 2001 From: Aarni Halinen Date: Wed, 17 Nov 2021 17:41:16 +0200 Subject: [PATCH] move footer out of webapp --- infoscreen/templates/infoscreen_admin.html | 2 +- members/templates/application_form_base.html | 2 +- members/templates/base.html | 2 +- static/css/footer.css | 40 ++++++++++---- templates/footer.html | 56 +++++++------------- webapp/static/webapp/css/footer.css | 34 ------------ webapp/templates/footer.html | 25 --------- 7 files changed, 53 insertions(+), 108 deletions(-) delete mode 100644 webapp/static/webapp/css/footer.css delete mode 100644 webapp/templates/footer.html diff --git a/infoscreen/templates/infoscreen_admin.html b/infoscreen/templates/infoscreen_admin.html index 47d3258..eadf0ed 100644 --- a/infoscreen/templates/infoscreen_admin.html +++ b/infoscreen/templates/infoscreen_admin.html @@ -41,5 +41,5 @@ -{% include "webapp:footer.html" %} +{% include "footer.html" %} {% endblock body %} \ No newline at end of file diff --git a/members/templates/application_form_base.html b/members/templates/application_form_base.html index 51af6d6..18ca670 100644 --- a/members/templates/application_form_base.html +++ b/members/templates/application_form_base.html @@ -35,6 +35,6 @@ {% block content %} {% endblock content %} - {% include "webapp:footer.html" %} + {% include "footer.html" %} diff --git a/members/templates/base.html b/members/templates/base.html index 7fa11c5..7b378ce 100644 --- a/members/templates/base.html +++ b/members/templates/base.html @@ -92,6 +92,6 @@ - {% include "webapp:footer.html" %} + {% include "footer.html" %} diff --git a/static/css/footer.css b/static/css/footer.css index 12361ab..076c14b 100644 --- a/static/css/footer.css +++ b/static/css/footer.css @@ -1,12 +1,34 @@ -footer { - background-color: #f5f5f5; - margin-top: 1vh; - position: absolute; - bottom: 0; - left: 0; - width: 100%; +#footer-div { + height:10vh; } -.ml-auto .nav-item { - padding: 1vh; +footer { + width: 100%; + height: 5rem; /* Set the fixed height of the footer here */ + margin-top: 2rem; +} + +footer .container .col .nav .nav-item { + display: inline-block; + margin-right: 3vh; +} + +.lang-button { + height: 4vh; + width: 6vh; + margin-left: 1vh; + margin-right: 1vh; +} + +.lang-select { + width: 10rem; + display: inline-block; +} + +footer .lang-form { + margin: 1rem auto 0; +} + +.footer-padder { + margin-top: 6rem; /* height of the footer element */ } diff --git a/templates/footer.html b/templates/footer.html index 03855da..c9074b3 100644 --- a/templates/footer.html +++ b/templates/footer.html @@ -1,43 +1,25 @@ {% load i18n %} {% load static %} {% load staticfiles %} - - -