footer: Make sure that spacing is always present

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/src/scss/style.scss b/src/scss/style.scss
index 18069ecd75f47514a6b793d480b4ad2c56a07581..68f4d7c2caf09a70eb7888af57c17cc02a251367 100644 (file)
--- a/src/scss/style.scss
+++ b/src/scss/style.scss
@@ -117,39 +117,42 @@ footer {
        margin-top: auto;
 
        .footer {
-               margin-top: $spacer * 4;
-               padding: 2rem 0 0 0;
+               margin-top: $spacer * 3;
 
-               color: $white;
-               background-color: rgba($gray-400, .04);
+               .footer-info {
+                       padding: 2rem 0 0 0;
 
-               @include media-breakpoint-down(md) {
-                       padding-top: 31px;
-               }
+                       color: $white;
+                       background-color: rgba($gray-400, .04);
 
-               a, .btn-link {
-                       color: inherit;
+                       @include media-breakpoint-down(md) {
+                               padding-top: 31px;
+                       }
 
-                       &:hover {
+                       a, .btn-link {
                                color: inherit;
+
+                               &:hover {
+                                       color: inherit;
+                               }
                        }
-               }
 
-               ul {
-                       li {
-                               margin-bottom: $spacer / 4;
+                       ul {
+                               li {
+                                       margin-bottom: $spacer / 4;
+                               }
                        }
                }
-       }
 
-       .copyright {
-               background-color: rgba($gray-400, .06);
-               padding: $spacer 0;
+               .copyright {
+                       background-color: rgba($gray-400, .06);
+                       padding: $spacer 0;
 
-               font-size: $small-font-size;
+                       font-size: $small-font-size;
 
-               a {
-                       color: $text-muted;
+                       a {
+                               color: $text-muted;
+                       }
                }
        }
 }

diff --git a/src/templates/base.html b/src/templates/base.html
index 7b0e7a5980b4c55064e73c562ade6606435d5df9..356e01e92b33b6e816fc011dd6412e3064ebb3d6 100644 (file)
--- a/src/templates/base.html
+++ b/src/templates/base.html
@@ -145,99 +145,101 @@
 
                {% block footer %}
                        <footer>
-                               {% if hostname in ("www.ipfire.org", "blog.ipfire.org", "dev.ipfire.org") %}
-                                       <div class="footer">
-                                               <div class="container pb-3">
-                                                       <div class="row mb-6 justify-content-between">
-                                                               <div class="col-12 col-lg-4 mb-4">
-                                                                       <h6>{{ _("Subscribe to our Newsletter") }}</h6>
+                               <div class="footer">
+                                       {% if hostname in ("www.ipfire.org", "blog.ipfire.org", "dev.ipfire.org") %}
+                                               <div class="footer-info">
+                                                       <div class="container pb-3">
+                                                               <div class="row mb-6 justify-content-between">
+                                                                       <div class="col-12 col-lg-4 mb-4">
+                                                                               <h6>{{ _("Subscribe to our Newsletter") }}</h6>
 
-                                                                       <form method="POST" action="https://{{ "dev.ipfire.org" if hostname == "dev.ipfire.org" else "www.ipfire.org" }}/newsletter/subscribe">
-                                                                               {% raw xsrf_form_html() %}
+                                                                               <form method="POST" action="https://{{ "dev.ipfire.org" if hostname == "dev.ipfire.org" else "www.ipfire.org" }}/newsletter/subscribe">
+                                                                                       {% raw xsrf_form_html() %}
 
-                                                                               <label class="sr-only" for="email">{{ _("Email Address") }}</label>
+                                                                                       <label class="sr-only" for="email">{{ _("Email Address") }}</label>
 
-                                                                               <input type="email" class="form-control mb-2 mr-sm-2" id="email" name="email"
-                                                                                       placeholder="{{ _("Your Email Address") }}">
+                                                                                       <input type="email" class="form-control mb-2 mr-sm-2" id="email" name="email"
+                                                                                               placeholder="{{ _("Your Email Address") }}">
 
-                                                                               <button type="submit" class="btn btn-primary btn-block mb-2">{{ _("Subscribe") }}</button>
-                                                                       </form>
-                                                               </div>
-
-                                                               <div class="col-12 col-lg-3 mb-4">
-                                                                       <h6>{{ _("About") }}</h6>
-
-                                                                       <div class="row">
-                                                                               <div class="col">
-                                                                                       <ul class="list-unstyled">
-                                                                                               <li>
-                                                                                                       <a href="https://www.ipfire.org/features">{{ _("Features") }}</a>
-                                                                                               </li>
-
-                                                                                               <li>
-                                                                                                       <a href="https://downloads.ipfire.org">{{ _("Download") }}</a>
-                                                                                               </li>
-
-                                                                                               <li>
-                                                                                                       <a href="https://www.ipfire.org/support">{{ _("Support") }}</a>
-                                                                                               </li>
-                                                                                       </ul>
-                                                                               </div>
-
-                                                                               <div class="col">
-                                                                                       <ul class="list-unstyled">
-                                                                                               <li>
-                                                                                                       <a href="https://blog.ipfire.org">{{ _("Blog") }}</a>
-                                                                                               </li>
-
-                                                                                               <li>
-                                                                                                       <a href="https://wiki.ipfire.org/devel/start">{{ _("Development") }}</a>
-                                                                                               </li>
+                                                                                       <button type="submit" class="btn btn-primary btn-block mb-2">{{ _("Subscribe") }}</button>
+                                                                               </form>
+                                                                       </div>
 
-                                                                                               <li>
-                                                                                                       <a href="https://www.ipfire.org/legal">{{ _("Legal") }}</a>
-                                                                                               </li>
-                                                                                       </ul>
+                                                                       <div class="col-12 col-lg-3 mb-4">
+                                                                               <h6>{{ _("About") }}</h6>
+
+                                                                               <div class="row">
+                                                                                       <div class="col">
+                                                                                               <ul class="list-unstyled">
+                                                                                                       <li>
+                                                                                                               <a href="https://www.ipfire.org/features">{{ _("Features") }}</a>
+                                                                                                       </li>
+
+                                                                                                       <li>
+                                                                                                               <a href="https://downloads.ipfire.org">{{ _("Download") }}</a>
+                                                                                                       </li>
+
+                                                                                                       <li>
+                                                                                                               <a href="https://www.ipfire.org/support">{{ _("Support") }}</a>
+                                                                                                       </li>
+                                                                                               </ul>
+                                                                                       </div>
+
+                                                                                       <div class="col">
+                                                                                               <ul class="list-unstyled">
+                                                                                                       <li>
+                                                                                                               <a href="https://blog.ipfire.org">{{ _("Blog") }}</a>
+                                                                                                       </li>
+
+                                                                                                       <li>
+                                                                                                               <a href="https://wiki.ipfire.org/devel/start">{{ _("Development") }}</a>
+                                                                                                       </li>
+
+                                                                                                       <li>
+                                                                                                               <a href="https://www.ipfire.org/legal">{{ _("Legal") }}</a>
+                                                                                                       </li>
+                                                                                               </ul>
+                                                                                       </div>
                                                                                </div>
                                                                        </div>
-                                                               </div>
 
-                                                               <div class="col-12 col-lg-4 text-center mb-4">
-                                                                       <a class="btn btn-primary btn-lg my-4" href="//www.ipfire.org/donate">
-                                                                               <span class="fas fa-heart"></span> {{ _("Donate") }}
-                                                                       </a>
-
-                                                                       <div class="btn-toolbar justify-content-center">
-                                                                               <a class="btn btn-link" href="https://twitter.com/ipfire">
-                                                                                       <span class="fab fa-twitter"></span>
+                                                                       <div class="col-12 col-lg-4 text-center mb-4">
+                                                                               <a class="btn btn-primary btn-lg my-4" href="//www.ipfire.org/donate">
+                                                                                       <span class="fas fa-heart"></span> {{ _("Donate") }}
                                                                                </a>
 
-                                                                               <a class="btn btn-link" href="https://www.facebook.com/IPFire.org">
-                                                                                       <span class="fab fa-facebook"></span>
-                                                                               </a>
+                                                                               <div class="btn-toolbar justify-content-center">
+                                                                                       <a class="btn btn-link" href="https://twitter.com/ipfire">
+                                                                                               <span class="fab fa-twitter"></span>
+                                                                                       </a>
 
-                                                                               <a class="btn btn-link" href="https://youtube.com/user/ipfireproject">
-                                                                                       <span class="fab fa-youtube"></span>
-                                                                               </a>
+                                                                                       <a class="btn btn-link" href="https://www.facebook.com/IPFire.org">
+                                                                                               <span class="fab fa-facebook"></span>
+                                                                                       </a>
+
+                                                                                       <a class="btn btn-link" href="https://youtube.com/user/ipfireproject">
+                                                                                               <span class="fab fa-youtube"></span>
+                                                                                       </a>
+                                                                               </div>
                                                                        </div>
                                                                </div>
                                                        </div>
                                                </div>
-                                       </div>
-                               {% end %}
-
-                               <div class="copyright">
-                                       <div class="container d-flex justify-content-between">
-                                               &copy; {{ year }} - {{ _("IPFire is free software written by the IPFire Project") }}
-
-                                               {% if not current_user and hostname in ("blog.ipfire.org") %}
-                                                       <a href="/login">{{ _("Login") }}</a>
-                                               {% elif current_user %}
-                                                       <span>
-                                                               {{ _("You are currently logged in as %s") % current_user.name }}
-                                                               <a href="/logout">{{ _("Logout") }}</a>
-                                                       </span>
-                                               {% end %}
+                                       {% end %}
+
+                                       <div class="copyright">
+                                               <div class="container d-flex justify-content-between">
+                                                       &copy; {{ year }} - {{ _("IPFire is free software written by the IPFire Project") }}
+
+                                                       {% if not current_user and hostname in ("blog.ipfire.org") %}
+                                                               <a href="/login">{{ _("Login") }}</a>
+                                                       {% elif current_user %}
+                                                               <span>
+                                                                       {{ _("You are currently logged in as %s") % current_user.name }}
+                                                                       <a href="/logout">{{ _("Logout") }}</a>
+                                                               </span>
+                                                       {% end %}
+                                               </div>
                                        </div>
                                </div>
                        </footer>