From 68f2b1199a683232225bbc2197d1f3f34739e21f Mon Sep 17 00:00:00 2001 From: henu Date: Tue, 31 Oct 2017 17:49:15 +0200 Subject: [PATCH 1/5] Fix base to use only bootstrap --- webapp/templates/base.html | 48 +++++++++++++++++++++++--------------- 1 file changed, 29 insertions(+), 19 deletions(-) diff --git a/webapp/templates/base.html b/webapp/templates/base.html index 3fe75d4..97506a5 100644 --- a/webapp/templates/base.html +++ b/webapp/templates/base.html @@ -10,7 +10,7 @@ - + {% trans "Aalto-yliopiston Sähköinsinöörikilta ry" %} @@ -29,24 +29,34 @@ - {% block header %} -
- {% include "sik_header.html" %} -
- {% endblock %} - -
- {% block navigation %} - {% include "navigation.html" %} - {% endblock %} - - {% block content %} - {% endblock %} -
-
- {% block footer %} - {% include "footer.html" %} - {% endblock footer %} +
+
+
+ {% block header %} + {% include "sik_header.html" %} + {% endblock %} +
+
+
+
+ {% block navigation %} + {% include "navigation.html" %} + {% endblock %} +
+
+
+
+ {% block content %} + {% endblock %} +
+
+
+
+ {% block footer %} + {% include "footer.html" %} + {% endblock footer %} +
+
From eec2d27504264c2d973aece82a9633015a0199f2 Mon Sep 17 00:00:00 2001 From: henu Date: Tue, 31 Oct 2017 19:30:23 +0200 Subject: [PATCH 2/5] Update bootstrap version --- webapp/templates/base.html | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/webapp/templates/base.html b/webapp/templates/base.html index 97506a5..755fb30 100644 --- a/webapp/templates/base.html +++ b/webapp/templates/base.html @@ -10,16 +10,19 @@ - + {% trans "Aalto-yliopiston Sähköinsinöörikilta ry" %} - - - + + + + + +