Skip to content

armgit / wger

Public Imported from GitHub
0

Self hosted FLOSS fitness/workout, nutrition and weight tracker

Cleanup the footer and make it sticky

Roland Geiderf8373c5a1077
diff --git a/wger/core/static/css/bootstrap-custom.css b/wger/core/static/css/bootstrap-custom.css
index b7600495a..3da9fe58b 100644
--- a/wger/core/static/css/bootstrap-custom.css
+++ b/wger/core/static/css/bootstrap-custom.css
@@ -29,7 +29,6 @@ html {
body {
font-family: "Open Sans Light", Arial, Helvetica, sans-serif;
- background-color: #204a87;
}
h1, h2, h3, h4, h5, h6 {
diff --git a/wger/core/static/css/workout-manager.css b/wger/core/static/css/workout-manager.css
index 4293387f0..42f70fc19 100644
--- a/wger/core/static/css/workout-manager.css
+++ b/wger/core/static/css/workout-manager.css
@@ -21,10 +21,26 @@
*
**************************************************************/
-#main {
- background-color: #fff;
+/* sticky footer */
+
+html {
+ position: relative;
+ min-height: 100%;
+}
+
+body {
+ margin-bottom: 4rem !important; /* Margin bottom by footer height */
+}
+
+footer {
+ position: absolute;
+ bottom: 0;
+ width: 100%;
+ height: 4rem; /* Set the fixed height of the footer here */
}
+
+/*
#main-footer {
background: none repeat scroll 0% 0% #eee;
border-top: 1px solid #e5e5e5;
@@ -32,6 +48,7 @@
padding-top: 1em;
padding-bottom: 1em;
}
+*/
/*
* Images in links are vertically aligned
diff --git a/wger/core/templates/template.html b/wger/core/templates/template.html
index 0a74fa560..32c138071 100644
--- a/wger/core/templates/template.html
+++ b/wger/core/templates/template.html
@@ -160,8 +160,10 @@
-<footer id="main-footer">
+<footer id="main-footer" class="bg-light border-top">
<div class="container">
+ <div class="row">
+ <div class="col-md-8">
{# #}
@@ -193,22 +195,23 @@
</div>
</div>
- <p>
+ <ul class="list-unstyled mb-0 pt-2">
+ <li><a href="{% url 'core:about' %}" class="text-muted small">{% trans "About" %}</a></li>
+ <li><a href="{% url 'software:tos' %}" class="text-muted small">{% trans "Terms of service" %}</a></li>
+ </ul>
+ <!--
<a href="https://github.com/wger-project/wger" class="no-hover">
<img src="{% static 'images/agpl-v3.svg' %}"
width="57"
height="20"
alt="{% trans 'Released under the Affero GPL' %}"
title="{% trans 'Released under the Affero GPL' %}"></a>
- <em class="text-muted small">{{version}}</em>
-
- | <a href="{% url 'core:about' %}" class="text-muted small">{% trans "About" %}</a>
- | <a href="{% url 'software:contribute' %}" class="text-muted small">{% trans "Contribute!" %}</a>
- | <a href="{% url 'core:contact' %}" class="text-muted small">{% trans "Get in touch" %}</a>
- | <a href="{% url 'software:tos' %}" class="text-muted small">{% trans "Terms of service" %}</a>
- </p>
+ <em class="text-muted small">{{version}}</em> -->
</div>
+ </div>
+ </div>
+ </div>
</footer>
<script src="{% static 'yarn/shariff/build/shariff.min.js' %}"></script>