~jan0sch/smederee: HTML/CSS: Fix some footer issues.

~jan0sch/smederee

Showing details for patch 9174dde393cfa51d0c8093aeff7609986b29572f.
2022-11-02 (Wed), 12:56 PM - Jens Grassel - 9174dde393cfa51d0c8093aeff7609986b29572f
HTML/CSS: Fix some footer issues.

Summary of changes

7 files modified with 93 lines added and 69 lines removed
modules/hub/src/main/resources/assets/css/landingpage.css with 7 added and 3 removed lines
modules/hub/src/main/twirl/de/smederee/hub/views/contact.scala.html with 17 added and 13 removed lines
modules/hub/src/main/twirl/de/smederee/hub/views/imprint.scala.html with 17 added and 13 removed lines
modules/hub/src/main/twirl/de/smederee/hub/views/main.scala.html with 1 added and 1 removed lines
modules/hub/src/main/twirl/de/smederee/hub/views/privacyPolicy.scala.html with 17 added and 13 removed lines
modules/hub/src/main/twirl/de/smederee/hub/views/publicAlpha.scala.html with 17 added and 13 removed lines
modules/hub/src/main/twirl/de/smederee/hub/views/termsOfUse.scala.html with 17 added and 13 removed lines
diff -rN -u old-smederee/modules/hub/src/main/resources/assets/css/landingpage.css new-smederee/modules/hub/src/main/resources/assets/css/landingpage.css
--- old-smederee/modules/hub/src/main/resources/assets/css/landingpage.css	2025-02-01 18:48:34.979533516 +0000
+++ new-smederee/modules/hub/src/main/resources/assets/css/landingpage.css	2025-02-01 18:48:34.983533520 +0000
@@ -4,6 +4,10 @@
   box-sizing: border-box;
 }
 
+main > .content {
+  margin-bottom: 3em;
+}
+
 /*
  * -- BASE STYLES --
  * Most of these are inherited from Base, but I want to change a few.
@@ -203,13 +207,12 @@
    */
   .content-wrapper {
 	/* These styles are required for the "scroll-over" effect */
+	background: white;
+	min-height: 12%;
 	position: absolute;
 	top: 87%;
 	width: 100%;
-	min-height: 12%;
 	z-index: 2;
-	background: white;
-
   }
 
   /* We want to give the content area some more padding */
@@ -250,6 +253,7 @@
 	position: fixed;
 	bottom: 0;
 	width: 100%;
+	z-index: 3;
   }
 
   /*
diff -rN -u old-smederee/modules/hub/src/main/twirl/de/smederee/hub/views/contact.scala.html new-smederee/modules/hub/src/main/twirl/de/smederee/hub/views/contact.scala.html
--- old-smederee/modules/hub/src/main/twirl/de/smederee/hub/views/contact.scala.html	2025-02-01 18:48:34.979533516 +0000
+++ new-smederee/modules/hub/src/main/twirl/de/smederee/hub/views/contact.scala.html	2025-02-01 18:48:34.983533520 +0000
@@ -7,7 +7,23 @@
     }
   </style>
 }
-@main(baseUri, lang)(customHeaders = myHeaders)(csrf, title) {
+@myFooters = {
+@defining(lang.toLocale) { implicit locale =>
+  <footer class="footer l-box is-center">
+    <div class="pure-menu pure-menu-horizontal">
+      <a class="pure-menu-heading pure-menu-link" href="https://www.wegtam.com" target="_blank">@Messages("global.copyright")</a>
+      <ul class="pure-menu-list">
+        <li class="pure-menu-item"><a class="pure-menu-link" href="@{baseUri.addPath("privacy-policy")}">@Messages("global.privacy")</a></li>
+        <li class="pure-menu-item"><a class="pure-menu-link" href="@{baseUri.addPath("terms-of-use")}">@Messages("global.terms.of.use")</a></li>
+        <li class="pure-menu-item"><a class="pure-menu-link" href="@{baseUri.addPath("imprint")}">@Messages("global.imprint")</a></li>
+        <li class="pure-menu-item pure-menu-active"><a class="pure-menu-link" href="@{baseUri.addPath("contact")}">@Messages("global.contact")</a></li>
+        <li class="pure-menu-item"><a class="pure-menu-link" href="@{baseUri.addPath("public-alpha")}">@Messages("global.alpha")</a></li>
+      </ul>
+    </div>
+  </footer>
+}
+}
+@main(baseUri, lang)(customFooters = myFooters, customHeaders = myHeaders)(csrf, title) {
 @defining(lang.toLocale) { implicit locale =>
 <div class="content">
   <div class="pure-g">
@@ -24,17 +40,5 @@
     </div>
   </div>
 </div>
-<footer class="footer l-box is-center">
-  <div class="pure-menu pure-menu-horizontal">
-    <a class="pure-menu-heading pure-menu-link" href="https://www.wegtam.com" target="_blank">@Messages("global.copyright")</a>
-    <ul class="pure-menu-list">
-      <li class="pure-menu-item"><a class="pure-menu-link" href="@{baseUri.addPath("privacy-policy")}">@Messages("global.privacy")</a></li>
-      <li class="pure-menu-item"><a class="pure-menu-link" href="@{baseUri.addPath("terms-of-use")}">@Messages("global.terms.of.use")</a></li>
-      <li class="pure-menu-item"><a class="pure-menu-link" href="@{baseUri.addPath("imprint")}">@Messages("global.imprint")</a></li>
-      <li class="pure-menu-item pure-menu-active"><a class="pure-menu-link" href="@{baseUri.addPath("contact")}">@Messages("global.contact")</a></li>
-      <li class="pure-menu-item"><a class="pure-menu-link" href="@{baseUri.addPath("public-alpha")}">@Messages("global.alpha")</a></li>
-    </ul>
-  </div>
-</footer>
 }
 }
diff -rN -u old-smederee/modules/hub/src/main/twirl/de/smederee/hub/views/imprint.scala.html new-smederee/modules/hub/src/main/twirl/de/smederee/hub/views/imprint.scala.html
--- old-smederee/modules/hub/src/main/twirl/de/smederee/hub/views/imprint.scala.html	2025-02-01 18:48:34.979533516 +0000
+++ new-smederee/modules/hub/src/main/twirl/de/smederee/hub/views/imprint.scala.html	2025-02-01 18:48:34.983533520 +0000
@@ -7,7 +7,23 @@
     }
   </style>
 }
-@main(baseUri, lang)(customHeaders = myHeaders)(csrf, title) {
+@myFooters = {
+@defining(lang.toLocale) { implicit locale =>
+  <footer class="footer l-box is-center">
+    <div class="pure-menu pure-menu-horizontal">
+      <a class="pure-menu-heading pure-menu-link" href="https://www.wegtam.com" target="_blank">@Messages("global.copyright")</a>
+      <ul class="pure-menu-list">
+        <li class="pure-menu-item"><a class="pure-menu-link" href="@{baseUri.addPath("privacy-policy")}">@Messages("global.privacy")</a></li>
+        <li class="pure-menu-item"><a class="pure-menu-link" href="@{baseUri.addPath("terms-of-use")}">@Messages("global.terms.of.use")</a></li>
+        <li class="pure-menu-item pure-menu-active"><a class="pure-menu-link" href="@{baseUri.addPath("imprint")}">@Messages("global.imprint")</a></li>
+        <li class="pure-menu-item"><a class="pure-menu-link" href="@{baseUri.addPath("contact")}">@Messages("global.contact")</a></li>
+        <li class="pure-menu-item"><a class="pure-menu-link" href="@{baseUri.addPath("public-alpha")}">@Messages("global.alpha")</a></li>
+      </ul>
+    </div>
+  </footer>
+}
+}
+@main(baseUri, lang)(customFooters = myFooters, customHeaders = myHeaders)(csrf, title) {
 @defining(lang.toLocale) { implicit locale =>
 <div class="content">
   <div class="pure-g">
@@ -37,17 +53,5 @@
     </div>
   </div>
 </div>
-<footer class="footer l-box is-center">
-  <div class="pure-menu pure-menu-horizontal">
-    <a class="pure-menu-heading pure-menu-link" href="https://www.wegtam.com" target="_blank">@Messages("global.copyright")</a>
-    <ul class="pure-menu-list">
-      <li class="pure-menu-item"><a class="pure-menu-link" href="@{baseUri.addPath("privacy-policy")}">@Messages("global.privacy")</a></li>
-      <li class="pure-menu-item"><a class="pure-menu-link" href="@{baseUri.addPath("terms-of-use")}">@Messages("global.terms.of.use")</a></li>
-      <li class="pure-menu-item pure-menu-active"><a class="pure-menu-link" href="@{baseUri.addPath("imprint")}">@Messages("global.imprint")</a></li>
-      <li class="pure-menu-item"><a class="pure-menu-link" href="@{baseUri.addPath("contact")}">@Messages("global.contact")</a></li>
-      <li class="pure-menu-item"><a class="pure-menu-link" href="@{baseUri.addPath("public-alpha")}">@Messages("global.alpha")</a></li>
-    </ul>
-  </div>
-</footer>
 }
 }
diff -rN -u old-smederee/modules/hub/src/main/twirl/de/smederee/hub/views/main.scala.html new-smederee/modules/hub/src/main/twirl/de/smederee/hub/views/main.scala.html
--- old-smederee/modules/hub/src/main/twirl/de/smederee/hub/views/main.scala.html	2025-02-01 18:48:34.979533516 +0000
+++ new-smederee/modules/hub/src/main/twirl/de/smederee/hub/views/main.scala.html	2025-02-01 18:48:34.983533520 +0000
@@ -18,7 +18,7 @@
   <main class="content-wrapper">
     @content
   </main>
-  <footer class="footer">@customFooters</footer>
+  @customFooters
 </body>
 </html>
 }
diff -rN -u old-smederee/modules/hub/src/main/twirl/de/smederee/hub/views/privacyPolicy.scala.html new-smederee/modules/hub/src/main/twirl/de/smederee/hub/views/privacyPolicy.scala.html
--- old-smederee/modules/hub/src/main/twirl/de/smederee/hub/views/privacyPolicy.scala.html	2025-02-01 18:48:34.983533520 +0000
+++ new-smederee/modules/hub/src/main/twirl/de/smederee/hub/views/privacyPolicy.scala.html	2025-02-01 18:48:34.983533520 +0000
@@ -7,7 +7,23 @@
     }
   </style>
 }
-@main(baseUri, lang)(customHeaders = myHeaders)(csrf, title) {
+@myFooters = {
+@defining(lang.toLocale) { implicit locale =>
+  <footer class="footer l-box is-center">
+    <div class="pure-menu pure-menu-horizontal">
+      <a class="pure-menu-heading pure-menu-link" href="https://www.wegtam.com" target="_blank">@Messages("global.copyright")</a>
+      <ul class="pure-menu-list">
+        <li class="pure-menu-item pure-menu-active"><a class="pure-menu-link" href="@{baseUri.addPath("privacy-policy")}">@Messages("global.privacy")</a></li>
+        <li class="pure-menu-item"><a class="pure-menu-link" href="@{baseUri.addPath("terms-of-use")}">@Messages("global.terms.of.use")</a></li>
+        <li class="pure-menu-item"><a class="pure-menu-link" href="@{baseUri.addPath("imprint")}">@Messages("global.imprint")</a></li>
+        <li class="pure-menu-item"><a class="pure-menu-link" href="@{baseUri.addPath("contact")}">@Messages("global.contact")</a></li>
+        <li class="pure-menu-item"><a class="pure-menu-link" href="@{baseUri.addPath("public-alpha")}">@Messages("global.alpha")</a></li>
+      </ul>
+    </div>
+  </footer>
+}
+}
+@main(baseUri, lang)(customFooters = myFooters, customHeaders = myHeaders)(csrf, title) {
 @defining(lang.toLocale) { implicit locale =>
 <div class="content">
   <div class="pure-g">
@@ -29,17 +45,5 @@
     </div>
   </div>
 </div>
-<footer class="footer l-box is-center">
-  <div class="pure-menu pure-menu-horizontal">
-    <a class="pure-menu-heading pure-menu-link" href="https://www.wegtam.com" target="_blank">@Messages("global.copyright")</a>
-    <ul class="pure-menu-list">
-      <li class="pure-menu-item pure-menu-active"><a class="pure-menu-link" href="@{baseUri.addPath("privacy-policy")}">@Messages("global.privacy")</a></li>
-      <li class="pure-menu-item"><a class="pure-menu-link" href="@{baseUri.addPath("terms-of-use")}">@Messages("global.terms.of.use")</a></li>
-      <li class="pure-menu-item"><a class="pure-menu-link" href="@{baseUri.addPath("imprint")}">@Messages("global.imprint")</a></li>
-      <li class="pure-menu-item"><a class="pure-menu-link" href="@{baseUri.addPath("contact")}">@Messages("global.contact")</a></li>
-      <li class="pure-menu-item"><a class="pure-menu-link" href="@{baseUri.addPath("public-alpha")}">@Messages("global.alpha")</a></li>
-    </ul>
-  </div>
-</footer>
 }
 }
diff -rN -u old-smederee/modules/hub/src/main/twirl/de/smederee/hub/views/publicAlpha.scala.html new-smederee/modules/hub/src/main/twirl/de/smederee/hub/views/publicAlpha.scala.html
--- old-smederee/modules/hub/src/main/twirl/de/smederee/hub/views/publicAlpha.scala.html	2025-02-01 18:48:34.983533520 +0000
+++ new-smederee/modules/hub/src/main/twirl/de/smederee/hub/views/publicAlpha.scala.html	2025-02-01 18:48:34.983533520 +0000
@@ -7,7 +7,23 @@
     }
   </style>
 }
-@main(baseUri, lang)(customHeaders = myHeaders)(csrf, title) {
+@myFooters = {
+@defining(lang.toLocale) { implicit locale =>
+  <footer class="footer l-box is-center">
+    <div class="pure-menu pure-menu-horizontal">
+      <a class="pure-menu-heading pure-menu-link" href="https://www.wegtam.com" target="_blank">@Messages("global.copyright")</a>
+      <ul class="pure-menu-list">
+        <li class="pure-menu-item"><a class="pure-menu-link" href="@{baseUri.addPath("privacy-policy")}">@Messages("global.privacy")</a></li>
+        <li class="pure-menu-item"><a class="pure-menu-link" href="@{baseUri.addPath("terms-of-use")}">@Messages("global.terms.of.use")</a></li>
+        <li class="pure-menu-item"><a class="pure-menu-link" href="@{baseUri.addPath("imprint")}">@Messages("global.imprint")</a></li>
+        <li class="pure-menu-item"><a class="pure-menu-link" href="@{baseUri.addPath("contact")}">@Messages("global.contact")</a></li>
+        <li class="pure-menu-item pure-menu-active"><a class="pure-menu-link" href="@{baseUri.addPath("public-alpha")}">@Messages("global.alpha")</a></li>
+      </ul>
+    </div>
+  </footer>
+}
+}
+@main(baseUri, lang)(customFooters = myFooters, customHeaders = myHeaders)(csrf, title) {
 @defining(lang.toLocale) { implicit locale =>
 <div class="content">
   <div class="pure-g">
@@ -36,17 +52,5 @@
     </div>
   </div>
 </div>
-<footer class="footer l-box is-center">
-  <div class="pure-menu pure-menu-horizontal">
-    <a class="pure-menu-heading pure-menu-link" href="https://www.wegtam.com" target="_blank">@Messages("global.copyright")</a>
-    <ul class="pure-menu-list">
-      <li class="pure-menu-item"><a class="pure-menu-link" href="@{baseUri.addPath("privacy-policy")}">@Messages("global.privacy")</a></li>
-      <li class="pure-menu-item"><a class="pure-menu-link" href="@{baseUri.addPath("terms-of-use")}">@Messages("global.terms.of.use")</a></li>
-      <li class="pure-menu-item"><a class="pure-menu-link" href="@{baseUri.addPath("imprint")}">@Messages("global.imprint")</a></li>
-      <li class="pure-menu-item"><a class="pure-menu-link" href="@{baseUri.addPath("contact")}">@Messages("global.contact")</a></li>
-      <li class="pure-menu-item pure-menu-active"><a class="pure-menu-link" href="@{baseUri.addPath("public-alpha")}">@Messages("global.alpha")</a></li>
-    </ul>
-  </div>
-</footer>
 }
 }
diff -rN -u old-smederee/modules/hub/src/main/twirl/de/smederee/hub/views/termsOfUse.scala.html new-smederee/modules/hub/src/main/twirl/de/smederee/hub/views/termsOfUse.scala.html
--- old-smederee/modules/hub/src/main/twirl/de/smederee/hub/views/termsOfUse.scala.html	2025-02-01 18:48:34.983533520 +0000
+++ new-smederee/modules/hub/src/main/twirl/de/smederee/hub/views/termsOfUse.scala.html	2025-02-01 18:48:34.983533520 +0000
@@ -7,7 +7,23 @@
 }
 </style>
 }
-@main(baseUri, lang)(customHeaders = myHeaders)(csrf, title) {
+@myFooters = {
+@defining(lang.toLocale) { implicit locale =>
+  <footer class="footer l-box is-center">
+    <div class="pure-menu pure-menu-horizontal">
+      <a class="pure-menu-heading pure-menu-link" href="https://www.wegtam.com" target="_blank">@Messages("global.copyright")</a>
+      <ul class="pure-menu-list">
+        <li class="pure-menu-item"><a class="pure-menu-link" href="@{baseUri.addPath("privacy-policy")}">@Messages("global.privacy")</a></li>
+        <li class="pure-menu-item pure-menu-active"><a class="pure-menu-link" href="@{baseUri.addPath("terms-of-use")}">@Messages("global.terms.of.use")</a></li>
+        <li class="pure-menu-item"><a class="pure-menu-link" href="@{baseUri.addPath("imprint")}">@Messages("global.imprint")</a></li>
+        <li class="pure-menu-item"><a class="pure-menu-link" href="@{baseUri.addPath("contact")}">@Messages("global.contact")</a></li>
+        <li class="pure-menu-item"><a class="pure-menu-link" href="@{baseUri.addPath("public-alpha")}">@Messages("global.alpha")</a></li>
+      </ul>
+    </div>
+  </footer>
+}
+}
+@main(baseUri, lang)(customFooters = myFooters, customHeaders = myHeaders)(csrf, title) {
 @defining(lang.toLocale) { implicit locale =>
 <div class="content">
   <div class="pure-g">
@@ -75,17 +91,5 @@
     </div>
   </div>
 </div>
-<footer class="footer l-box is-center">
-  <div class="pure-menu pure-menu-horizontal">
-    <a class="pure-menu-heading pure-menu-link" href="https://www.wegtam.com" target="_blank">@Messages("global.copyright")</a>
-    <ul class="pure-menu-list">
-      <li class="pure-menu-item"><a class="pure-menu-link" href="@{baseUri.addPath("privacy-policy")}">@Messages("global.privacy")</a></li>
-      <li class="pure-menu-item pure-menu-active"><a class="pure-menu-link" href="@{baseUri.addPath("terms-of-use")}">@Messages("global.terms.of.use")</a></li>
-      <li class="pure-menu-item"><a class="pure-menu-link" href="@{baseUri.addPath("imprint")}">@Messages("global.imprint")</a></li>
-      <li class="pure-menu-item"><a class="pure-menu-link" href="@{baseUri.addPath("contact")}">@Messages("global.contact")</a></li>
-      <li class="pure-menu-item"><a class="pure-menu-link" href="@{baseUri.addPath("public-alpha")}">@Messages("global.alpha")</a></li>
-    </ul>
-  </div>
-</footer>
 }
 }