From 402cdc3533980287468a78f367fcb4c66d9f406d Mon Sep 17 00:00:00 2001
From: Jan Tuomi <jans.tuomi@gmail.com>
Date: Thu, 26 Oct 2017 13:51:00 +0300
Subject: [PATCH] Fix styles that accidentally got into production :D

---
 static/css/footer.css               |  6 +--
 templates/footer.html               | 63 +++++++++++++----------------
 webapp/static/css/kaehmy_nav.css    |  2 +-
 webapp/static/css/sik_header.css    |  4 ++
 webapp/templates/kaehmy_header.html |  4 +-
 5 files changed, 39 insertions(+), 40 deletions(-)

diff --git a/static/css/footer.css b/static/css/footer.css
index 3432e11..bf63819 100644
--- a/static/css/footer.css
+++ b/static/css/footer.css
@@ -3,11 +3,11 @@
 }
 
 footer {
-    position: absolute;
+    /* position: absolute; */
     bottom: 0;
     width: 100%;
     height: 60px; /* Set the fixed height of the footer here */
-    line-height: 60px; /* Vertically center the text there */
+    /* line-height: 60px; /* Vertically center the text there */ */
     margin-top: 2rem;
     margin-bottom: 1rem;
 }
@@ -30,5 +30,5 @@ footer .container .col .nav .nav-item {
 }
 
 footer .lang-form {
-    max-width: 10rem;
+    margin: 1rem auto 0;
 }
diff --git a/templates/footer.html b/templates/footer.html
index d4eb5b2..cb749a1 100644
--- a/templates/footer.html
+++ b/templates/footer.html
@@ -3,40 +3,35 @@
 {% load staticfiles %}
 <link rel="stylesheet" href="{% static "css/footer.css" %}">
 
-<footer>
-    <div class="container">
-        <div class="row align-items-center">
-            <div class="col">
-                <form class="lang-form form" action="{% url 'set_language' %}" method="post">{% csrf_token %}
-                    <span>
-                        <input name="next" type="hidden" value="{{ redirect_to }}" />
-                        <select onchange="this.form.submit()" class="lang-select form-control" name="language">
-                            {% get_current_language as LANGUAGE_CODE %}
-                            {% get_available_languages as LANGUAGES %}
-                            {% get_language_info_list for LANGUAGES as languages %}
-                            {% for language in languages %}
-                            <option value="{{ language.code }}"{% if language.code == LANGUAGE_CODE %} selected="selected"{% endif %}>
-                                {{ language.name_local }} ({{ language.code }})
-                            </option>
-                            {% endfor %}
-                        </select>
-                    </span>
-                </form>
-                <span>{% trans "Copyright Aalto-yliopiston Sähköinsinöörikilta ry" %} {% now 'Y' %}</span>
-            </div>
-            <div class="col">
-                <ul class="nav">
-                    <li class="nav-item">
-                        <a href="/members"><i class="fa fa-group"></i></a>
-                    </li>
-                    <li class="nav-item">
-                        <a href="/infoscreen"><i class="fa fa-info"></i></a>
-                    </li>
-                    <li class="nav-item">
-                        <a href="/admin"><i class="fa fa-gears"></i></a>
-                    </li>
-                </ul>
-            </div>
+<footer style="text-align: center">
+    <div>
+        <form class="lang-form form" action="{% url 'set_language' %}" method="post">{% csrf_token %}
+            <span>
+                <input name="next" type="hidden" value="{{ redirect_to }}" />
+                <select onchange="this.form.submit()" class="lang-select form-control" name="language">
+                    {% get_current_language as LANGUAGE_CODE %}
+                    {% get_available_languages as LANGUAGES %}
+                    {% get_language_info_list for LANGUAGES as languages %}
+                    {% for language in languages %}
+                    <option value="{{ language.code }}"{% if language.code == LANGUAGE_CODE %} selected="selected"{% endif %}>
+                        {{ language.name_local }} ({{ language.code }})
+                    </option>
+                    {% endfor %}
+                </select>
+            </span>
+        </form>
+        <span>{% trans "Copyright Aalto-yliopiston Sähköinsinöörikilta ry" %} {% now 'Y' %}</span>
+    </div>
+        <div>
+            <span class="nav-item">
+                <a href="/members"><i class="fa fa-group"></i></a>
+            </span>
+            <span class="nav-item">
+                <a href="/infoscreen"><i class="fa fa-info"></i></a>
+            </span>
+            <span class="nav-item">
+                <a href="/admin"><i class="fa fa-gears"></i></a>
+            </span>
         </div>
     </div>
 </footer>
diff --git a/webapp/static/css/kaehmy_nav.css b/webapp/static/css/kaehmy_nav.css
index 3db3e87..8b629d1 100644
--- a/webapp/static/css/kaehmy_nav.css
+++ b/webapp/static/css/kaehmy_nav.css
@@ -8,4 +8,4 @@
 
 .navbar-light .navbar-nav .nav-link {
     color: #102a40;
-}
\ No newline at end of file
+}
diff --git a/webapp/static/css/sik_header.css b/webapp/static/css/sik_header.css
index 1424c20..7a98d73 100644
--- a/webapp/static/css/sik_header.css
+++ b/webapp/static/css/sik_header.css
@@ -31,3 +31,7 @@
         margin-bottom: 331px;
     }
 }
+
+.kaehmy-banner-image {
+    width: 100%;
+}
\ No newline at end of file
diff --git a/webapp/templates/kaehmy_header.html b/webapp/templates/kaehmy_header.html
index 79e3f50..f536c5a 100644
--- a/webapp/templates/kaehmy_header.html
+++ b/webapp/templates/kaehmy_header.html
@@ -1,8 +1,8 @@
 {% load i18n %}
 <link rel="stylesheet" href="/static/css/sik_header.css">
 
-<div class="header-content">
+<div class="kaehmy_header-content">
     <div class="kaehmy-banner logo">
-        <a href="/kaehmy"><img src="/static/img/kaehmy_banner.png" alt="Aalto-yliopiston Sähköinsinöörikilta ry"></a>
+        <a href="/kaehmy"><img class="kaehmy-banner-image" src="/static/img/kaehmy_banner.png" alt="Aalto-yliopiston Sähköinsinöörikilta ry"></a>
     </div>
 </div>