From c2c1641265eb40b9a0139583c4f1a31618590c9d Mon Sep 17 00:00:00 2001
From: Florian Dold <florian.dold@gmail.com>
Date: Tue, 25 Jun 2019 21:45:56 +0200
Subject: redesign attempt

---
 common/footer.j2.inc     | 50 ++++++++++++++++++++++++------------------------
 common/navigation.j2.inc | 21 +++++---------------
 2 files changed, 30 insertions(+), 41 deletions(-)

(limited to 'common')

diff --git a/common/footer.j2.inc b/common/footer.j2.inc
index c516f6d4..290e5c02 100644
--- a/common/footer.j2.inc
+++ b/common/footer.j2.inc
@@ -1,32 +1,32 @@
 <footer id="footer">
-  <div class="container-fluid cushion-below">
-    <div class="container">
-      <div class="row">
-        <div class="col-12 col-sm-4">
-          <ul class="footer-list">
-            <li><p><a href="about.html">{{ _("About") }}</a></p></li>
-            <li><p><a href="contact.html">{{ _("Contact") }}</a></p></li>
-            <li><p><a href="investors.html">{{ _("For Investors") }}</a></p></li>
-          </ul>
-        </div>
-        <div class="col-12 col-sm-4">
-          <ul class="footer-list">
-            <li><p><a href="citizens.html">{{ _("Citizens")}} </a></p></li>
-            <li><p><a href="merchants.html">{{ _("Merchants") }}</a></p></li>
-            <li><p><a href="governments.html">{{ _("Governments") }} </a></p></li>
-          </ul>
-        </div>
-        <div class="col-12 col-sm-4">
-          <ul class="footer-list">
-            <li><p><a href="developers.html">{{ _("Developer Resources") }}</a></p></li>
-            <li><p><a href="faq.html">{{ _("FAQ") }}</a></p></li>
-            <li><p><a href="bibliography.html">{{ _("Bibliography") }}</a></p></li>
-          </ul>
-        </div>
+  <div class="container">
+    <div class="row justify-content-center">
+      <div class="col-12">
+        <hr style="border-top: 1px solid #00000069; padding-bottom: 1em" />
+      </div>
+    </div>
+    <div class="row">
+      <div class="col-12 col-sm-4">
+        <ul class="footer-list">
+          <li><p><a href="about.html">{{ _("About") }}</a></p></li>
+          <li><p><a href="contact.html">{{ _("Contact") }}</a></p></li>
+        </ul>
+      </div>
+      <div class="col-12 col-sm-4">
+        <ul class="footer-list">
+          <li><p><a href="investors.html">{{ _("For Investors") }}</a></p></li>
+          <li><p><a href="developers.html">{{ _("Developer Resources") }}</a></p></li>
+        </ul>
+      </div>
+      <div class="col-12 col-sm-4">
+        <ul class="footer-list">
+          <li><p><a href="faq.html">{{ _("FAQ") }}</a></p></li>
+          <li><p><a href="bibliography.html">{{ _("Bibliography") }}</a></p></li>
+        </ul>
       </div>
     </div>
   </div>
-  <div class="container text-center">
+  <div class="text-center mt-5">
     <p>&copy; <a href="https://gnunet.org/en/ev.html">GNUnet e.V.</a> {{_("and") }}
               Taler Systems SA 2015-2019</p>
     <p>We are grateful for support and free hosting of this site by
diff --git a/common/navigation.j2.inc b/common/navigation.j2.inc
index 26f4bd9b..420e57e9 100644
--- a/common/navigation.j2.inc
+++ b/common/navigation.j2.inc
@@ -1,4 +1,4 @@
-<nav class="navbar navbar-toggleable navbar-toggleable-md navbar-expand-md navbar-inverse navbar-dark" style="background-color: black; border-radius: 0px;"> <!-- bg-dark -->
+<nav class="navbar navbar-toggleable navbar-toggleable-md navbar-expand-md navbar-light" style="border-radius: 0px;">
   <div class="container-fluid">
     <button class="navbar-toggler navbar-toggler-right"
             type="button"
@@ -12,21 +12,10 @@
     <div class="collapse navbar-collapse" id="navbarMain">
     <ul class="navbar-nav mr-auto">
       <li class="{{ 'active' if filename == 'index.html' else '' }}"><a class="navbar-brand taler_home" href="index.html">Taler</a></li>
-      <li class="nav-item {{ 'active' if filename == 'citizens.html' else '' }}"><a class="nav-link" href="citizens.html">{{ _("Citizens") }} </a></li>
-      <li class="nav-item {{ 'active' if filename == 'merchants.html' else '' }}"><a class="nav-link" href="merchants.html">{{ _("Merchants") }} </a></li>
-      <li class="nav-item {{ 'active' if filename == 'governments.html' else '' }}"><a class="nav-link" href="governments.html">{{ _("Governments") }}</a></li>
-      <li class="nav-item dropdown">
-        <a class="nav-link dropdown-toggle" href="#" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">{{ _("Resources") }}</a>
-        <ul class="dropdown-menu">
-          <li><a class="dropdown-item" href="architecture.html">{{ _("System Architecture") }}</a></li>
-          <li><a class="dropdown-item" href="faq.html">{{ _("FAQ") }}</a></li>
-          <li><a class="dropdown-item" href="glossary.html">{{ _("Glossary") }}</a></li>
-          <li><a class="dropdown-item" href="developers.html">{{ _("Developer Introduction") }} </a></li>
-          <li><a class="dropdown-item" href="copyright.html">{{ _("Copyright for Contributors") }} </a></li>
-          <li><a class="dropdown-item" href="bibliography.html">{{ _("Bibliography") }}</a></li>
-          <li><a class="dropdown-item" href="gsoc-codeless.html">{{ _("Gsoc 2018: Codeless Payments") }}</a></li>
-        </ul>
-      </li>
+      <li class="nav-item {{ 'active' if filename == 'features.html' else '' }}"><a class="nav-link" href="features.html">{{ _("Features") }} </a></li>
+      <li class="nav-item {{ 'active' if filename == 'design.html' else '' }}"><a class="nav-link" href="design.html">{{ _("Design") }} </a></li>
+      <li class="nav-item"><a class="nav-link" href="https://docs.taler.net/">{{ _("Docs") }} </a></li>
+      <li class="nav-item {{ 'active' if filename == 'about.html' else '' }}"><a class="nav-link" href="about.html">{{ _("Team") }}</a></li>
     </ul>
     <ul class="navbar-nav navbar-right">
       <li class="nav-item dropdown">
-- 
cgit v1.2.3