TTMK/web2.0-backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Refactor footer

Browse Source
This commit is contained in:
henu
2017-10-31 19:31:41 +02:00
parent eec2d27504
commit 60451aaadf
4 changed files with 72 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files
static/css/footer.css
+4 -12
View File
@@ -1,18 +1,10 @@
#footer-div {
height:10vh;
}
footer { footer {
/* position: absolute; */ position: absolute;
bottom: 0; bottom: 0;
width: 100%; background-color: #f5f5f5;
height: 60px; /* Set the fixed height of the footer here */
/* line-height: 60px; /* Vertically center the text there */ */
margin-top: 2rem;
margin-bottom: 1rem;
} }
footer .container .col .nav .nav-item { /*footer .container .col .nav .nav-item {
display: inline-block; display: inline-block;
margin-right: 3vh; margin-right: 3vh;
} }
@@ -31,4 +23,4 @@ footer .container .col .nav .nav-item {
footer .lang-form { footer .lang-form {
margin: 1rem auto 0; margin: 1rem auto 0;
} }*/
templates/footer.html
+63 -29
View File
@@ -3,35 +3,69 @@
{% load staticfiles %} {% load staticfiles %}
<link rel="stylesheet" href="{% static "css/footer.css" %}"> <link rel="stylesheet" href="{% static "css/footer.css" %}">
<footer style="text-align: center"> <footer class="footer">
<div> <div class="container">
<form class="lang-form form" action="{% url 'set_language' %}" method="post">{% csrf_token %} <div class="d-flex align-items-center justify-content-end">
<span> <div class="p-2">
<input name="next" type="hidden" value="{{ redirect_to }}" /> <span>{% trans "Copyright Aalto-yliopiston Sähköinsinöörikilta ry" %} {% now 'Y' %}</span>
<select onchange="this.form.submit()" class="lang-select form-control" name="language"> </div>
{% get_current_language as LANGUAGE_CODE %} <div class="p-2">
{% get_available_languages as LANGUAGES %} <form class="lang-form form" action="{% url 'set_language' %}" method="post">{% csrf_token %}
{% get_language_info_list for LANGUAGES as languages %} <span class="form-group">
{% for language in languages %} <input name="next" type="hidden" value="{{ redirect_to }}" />
<option value="{{ language.code }}"{% if language.code == LANGUAGE_CODE %} selected="selected"{% endif %}> <select onchange="this.form.submit()" class="lang-select form-control" name="language">
{{ language.name_local }} ({{ language.code }}) {% get_current_language as LANGUAGE_CODE %}
</option> {% get_available_languages as LANGUAGES %}
{% endfor %} {% get_language_info_list for LANGUAGES as languages %}
</select> {% for language in languages %}
</span> <option value="{{ language.code }}"{% if language.code == LANGUAGE_CODE %} selected="selected"{% endif %}>
</form> {{ language.name_local }} ({{ language.code }})
<span>{% trans "Copyright Aalto-yliopiston Sähköinsinöörikilta ry" %} {% now 'Y' %}</span> </option>
</div> {% endfor %}
<div> </select>
<span class="nav-item"> </span>
<a href="/members"><i class="fa fa-group"></i></a> </form>
</span> </div>
<span class="nav-item"> <div class="ml-auto p-2">
<a href="/infoscreen"><i class="fa fa-info"></i></a> <span class="nav-item">
</span> <a href="/members"><i class="fa fa-group"></i></a>
<span class="nav-item"> </span>
<a href="/admin"><i class="fa fa-gears"></i></a> <span class="nav-item">
</span> <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> </div>
</div> </div>
</footer> </footer>
<!-- <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>
-->
<!-- <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> -->
webapp/static/css/sik_header.css
-24
View File
@@ -11,27 +11,3 @@
height: auto; height: auto;
margin: auto; margin: auto;
} }
.kaehmy-banner {
max-width: 1000px;
margin-left: auto;
margin-right: auto;
}
@media screen and (min-width: 1000px) {
.kaehmy_header-content {
position: absolute;
left: 0;
top: 0;
background-color: #052f5f;
width: 100%;
}
.kaehmy_header {
margin-bottom: 331px;
}
}
.kaehmy-banner-image {
width: 100%;
}
webapp/static/css/webapp.css
+5 -22
View File
@@ -1,26 +1,9 @@
.page-content { html {
margin-top: 1vh; position: relative;
width: 90%; min-height: 100%;
margin-left: auto;
margin-right: auto;
} }
body { body {
max-width: 1000px; /*Margin bottom by footer hight*/
margin-left: auto !important; margin-bottom: 60px;
margin-right: auto !important;
} }
div.tooltip-inner {
max-width: 25rem;
}
.tooltip {
margin-left: 1rem;
}
.role-filter-form {
max-width: 30rem;
width: auto;
margin-bottom: 1rem;
}