Simplify navbar in an attempt to make the menu button work.

3 files changed, 190 insertions, 162 deletions

diff --git a/common/navigation.j2.inc b/common/navigation.j2.inc
index 53d52684..ff7957aa 100644
--- a/common/navigation.j2.inc
+++ b/common/navigation.j2.inc
@@ -15,16 +15,19 @@
     }
   </style>
 </noscript>
-<nav class="navbar navbar-toggleable navbar-toggleable-md navbar-expand-md navbar-inverse navbar-dark fixed-top bg-dark">
+<!-- <nav class="navbar navbar-toggleable navbar-toggleable-md navbar-expand-md navbar-inverse navbar-dark fixed-top bg-dark"> -->
+<!--<nav class="navbar navbar-expand-md navar-inverse navbar-dark bg-dark fixed-top"> -->
+<nav class="navbar navbar-expand-md fixed-top">
   <a class="navbar-brand" href="index.html">
     <!-- 
       TODO: imo this is bad in the navbar.
       a readable "gnunet" font-logo would
       be better for orientation.
       -->
-    <img src="{{ url('static/images/gnunet-icon.png') }}" alt="GNUnet Home Icon" />
-    <!-- <img width="70%" height="70%" src="../static/images/gnunet-logo-dark-only-text.svg" alt="" /> -->
+      <img src="{{ url('static/images/gnunet-icon.png') }}" alt="GNUnet Home Icon" />
   </a>
+
+  <!-- menu button -->
   <button class="navbar-toggler navbar-toggler-right custom-toggler"
           type="button"
           data-toggle="collapse"
@@ -32,10 +35,13 @@
           aria-controls="navbarMain"
           aria-expanded="false"
           aria-label="Toggle navigation">
-    <span class="navbar-toggler-icon"></span>
+          <span class="navbar-toggler-icon"></span>
   </button>
+  <!-- /menu button -->
+
+  <!-- navbar -->
   <div class="collapse navbar-collapse" id="navbarMain">
-    <ul class="navbar-nav mr-auto">
+    <ul class="navbar-nav mr-auto nav">
       <li class="nav-item dropdown">
         <a class="nav-link dropdown-toggle" href="#" data-toggle="dropdown"
            role="button" aria-haspopup="true" aria-expanded="false">
@@ -69,7 +75,7 @@
            role="button"
            aria-haspopup="true"
            aria-expanded="false">
-          {{ _("Documentation") }}
+           {{ _("Documentation") }}
         </a>
         <ul class="dropdown-menu" aria-labelledby="navbarMain">
           <li><a class="dropdown-item" href="tutorial.html">{{ _("Tutorials") }}</a></li>
@@ -81,18 +87,13 @@
         </ul>
       </li>
     </ul>
-    <ul class="navbar-nav navbar-right">
+    <ul class="navbar-nav navbar-right nav">
       <li class="nav-item dropdown">
-        <!--
-          <button class="btn btn-dark dropdown-toggle" type="button" id="dropdownMenu1" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true">
-            <img src="{{ url('static/images/languageicon.svg') }}" height="15" alt="[{{lang}}]" /> {{ lang_full }} [{{ lang }}] 
-          </button>
-          -->
-          <a class="nav-link dropdown-toggle" href="#"
-             data-toggle="dropdown" role="button"
-             aria-haspopup="true" aria-expanded="false">
-             {{ lang_full }} [{{ lang }}]
-          </a>
+        <a class="nav-link dropdown-toggle" href="#"
+           data-toggle="dropdown" role="button"
+           aria-haspopup="true" aria-expanded="false">
+           {{ lang_full }} [{{ lang }}]
+        </a>
         <ul class="dropdown-menu dropdown-menu-right" aria-labelledby="navbarMain">
           <li><a class="dropdown-item" href="{{ self_localized('en') }}">English [en]</a></li>
           <li><a class="dropdown-item" href="{{ self_localized('de') }}">Deutsch [de]</a></li>
@@ -100,7 +101,7 @@
           <li><a class="dropdown-item" href="{{ self_localized('it') }}">Italiano [it]</a></li>
           <li><a class="dropdown-item" href="{{ self_localized('es') }}">Espa&ntilde;ol [es]</a></li>
         </ul>
-      </li>
-    </ul>
-  </div>
+      </li> <!-- /navbar-right dropdown -->
+    </ul> <!-- /navbar-right -->
+  </div> <!-- /navbar -->
 </nav>
diff --git a/static/navbar.css b/static/navbar.css
index 5028cbbf..5768b898 100644
--- a/static/navbar.css
+++ b/static/navbar.css
@@ -4,6 +4,7 @@
 
 .navbar {
     margin-bottom: 0px;
+    background: #0C120C;
 }
 
 .sidebar-nav {
@@ -46,7 +47,7 @@
     left: 10px;
     top: 11px;
     left: -6px;
- }
+}
 
 .custom-toggler.navbar.toggler {
     border-color: rgb(255,102,203);
@@ -57,3 +58,29 @@
     /* background-image: url("data:image/svg+xml;charset=utf8,%3Csvg viewBox='0 0 32 32' xmlns='http://www.w3.org/2000/svg'%3E%3Cpath stroke='rgba(255,102,203, 0.7)' stroke-width='2' stroke-linecap='round' stroke-miterlimit='10' d='M4 8h24M4 16h24M4 24h24'/%3E%3C/svg%3E"); */
     background-image: url("data:image/svg+xml;charset=utf8,%3Csvg viewBox='0 0 32 32' xmlns='http://www.w3.org/2000/svg'%3E%3Cpath stroke='rgba(102,136,170, 0.7)' stroke-width='2' stroke-linecap='round' stroke-miterlimit='10' d='M4 8h24M4 16h24M4 24h24'/%3E%3C/svg%3E");
 }
+
+.nav a {
+    color: white !important;
+}
+
+.dropdown-menu, .dropdown-item {
+    background: #0C120C;
+    color: white;
+}
+
+.dropdown-menu a,
+.dropdown-item a {
+    background: #0C120C;
+    color: white !important;
+    text-decoration: none;
+    text-decoration-style: none;
+}
+.dropdown-menu:visited, .dropdown-item a:visited,
+.dropdown-menu a:hover, .dropdown-item a:hover,
+.dropdown-menu a:active, .dropdown-item a:active,
+.dropdown-menu a:link, .dropdown-item a:link {
+    background: #0C120C;
+    color: white !important;
+    text-decoration: none;
+    text-decoration-style: none;
+}
diff --git a/static/styles.css b/static/styles.css
index b6e8248b..1b8b4606 100644
--- a/static/styles.css
+++ b/static/styles.css
@@ -1,42 +1,42 @@
 .static-top {
-        position: fixed;
-        top: 0;
-        right: 0;
-        left: 0;
-        z-index: 3;
+    position: fixed;
+    top: 0;
+    right: 0;
+    left: 0;
+    z-index: 3;
 }
 
 .skip {
-        display:none!important;
+    display:none!important;
 }
 
 .skip {
-        position: absolute;
-        top: 0;
-        left: 0;
-        width: 100%;
-        font-size: .857143em;
+    position: absolute;
+    top: 0;
+    left: 0;
+    width: 100%;
+    font-size: .857143em;
 }
 
 .skip li {
-        position:absolute;
-        z-index:1;
-        margin:0;
+    position:absolute;
+    z-index:1;
+    margin:0;
 }
 .skip a {
-        position:absolute;
-        left:-9999px;
+    position:absolute;
+    left:-9999px;
 }
 .skip a:active,
 .skip a:focus {
- display:block;
- position:static;
- left:0;
- padding:.25em 1em;
+    display:block;
+    position:static;
+    left:0;
+    padding:.25em 1em;
 }
 
 code {
-  margin-bottom: 1em;
+    margin-bottom: 1em;
 }
 
 /* hyperlinks and buttons */
@@ -49,8 +49,8 @@ code {
 a.btn,
 a.btn:link,
 a.btn:visited {
-        text-decoration: none !important;
-        color: white !important;
+    text-decoration: none !important;
+    color: white !important;
 }
 /* For reference if bootstrap does not cover the main-Element issue in IE9-11 */
 /*
@@ -76,147 +76,147 @@ body {
 }
 */
 .team {
-        padding: 75px 0;
+    padding: 75px 0;
 }
 h6.description {
-        font-weight: bold;
-        letter-spacing: 2px;
-        color: #999;
-        border-bottom: 1px solid rgba(0, 0, 0, 0.1);
-        padding-bottom: 5px;
+    font-weight: bold;
+    letter-spacing: 2px;
+    color: #999;
+    border-bottom: 1px solid rgba(0, 0, 0, 0.1);
+    padding-bottom: 5px;
 }
 .profile {
-        margin-top: 25px;
+    margin-top: 25px;
 }
 .profile h1{
-        font-weight: normal;
-        font-size: 20px;
-        margin: 10px 0 0 0;
+    font-weight: normal;
+    font-size: 20px;
+    margin: 10px 0 0 0;
 }
 .profile h2{
-        font-size: 14px;
-        font-weight: lighter;
-        margin-top: 5px;
+    font-size: 14px;
+    font-weight: lighter;
+    margin-top: 5px;
 }
 .profile .img-box {
-        opacity: 1;
-        display: block;
-        position: relative;
-  min-height: 160px;
+    opacity: 1;
+    display: block;
+    position: relative;
+    min-height: 160px;
 }
 .profile .img-box:after{
-        content:"";
-        opacity: 0;
-        background-color: rgba(0, 0, 0, 0.75);
-        position: absolute;
-        right: 0;
-        left: 0;
-        top: 0;
-        bottom: 0;
+    content:"";
+    opacity: 0;
+    background-color: rgba(0, 0, 0, 0.75);
+    position: absolute;
+    right: 0;
+    left: 0;
+    top: 0;
+    bottom: 0;
 }
 
 .profile .img-none {
-  text-align: center;
+    text-align: center;
 }
 
 .profile .img-none i.fa {
-  color: #eee;
-  font-size: 8em;
+    color: #eee;
+    font-size: 8em;
 }
 
 .img-box ul{
-        position: absolute;
-        z-index: 2;
-        bottom: 50px;
-        text-align: center;
-        width: 100%;
-        padding-left: 0px;
-        height: 0px;
-        margin: 0px;
-        opacity: 0;
+    position: absolute;
+    z-index: 2;
+    bottom: 50px;
+    text-align: center;
+    width: 100%;
+    padding-left: 0px;
+    height: 0px;
+    margin: 0px;
+    opacity: 0;
 }
 .profile .img-box:after, .img-box ul, .img-box ul li {
-        -webkit-transition: all 0.5s ease-in-out 0s;
-        -moz-transition: all 0.5s ease-in-out 0s;
-        transition: all 0.5s ease-in-out 0s;
+    -webkit-transition: all 0.5s ease-in-out 0s;
+    -moz-transition: all 0.5s ease-in-out 0s;
+    transition: all 0.5s ease-in-out 0s;
 }
 .img-box ul i{
-        font-size: 20px;
-        letter-spacing: 10px;
+    font-size: 20px;
+    letter-spacing: 10px;
 }
 .img-box ul li{
-        width: 30px;
-        height: 30px;
-        text-align: center;
-        /*border: 1px solid #88C425;*/
-  color: #88C425;
-        margin: 2px;
-        padding: 5px;
-        display: inline-block;
+    width: 30px;
+    height: 30px;
+    text-align: center;
+    /*border: 1px solid #88C425;*/
+    color: #88C425;
+    margin: 2px;
+    padding: 5px;
+    display: inline-block;
 }
 .img-box a {
-        color: #fff;
+    color: #fff;
 }
 .img-box:hover:after{
-        opacity: 1;
+    opacity: 1;
 }
 .img-box:hover ul{
-        opacity: 1;
+    opacity: 1;
 }
 .img-box ul a {
-        -webkit-transition: all 0.3s ease-in-out 0s;
-        -moz-transition: all 0.3s ease-in-out 0s;
-        transition: all 0.3s ease-in-out 0s;
+    -webkit-transition: all 0.3s ease-in-out 0s;
+    -moz-transition: all 0.3s ease-in-out 0s;
+    transition: all 0.3s ease-in-out 0s;
 }
 .img-box a:hover li{
-        border-color: #fff;
-        color: #88C425;
+    border-color: #fff;
+    color: #88C425;
 }
 i.red {
-        color: #BC0213;
+    color: #BC0213;
 }
 .btn-primary {
-        color: #fff;
-        background-color: #678;
-        border-color: #68a;
+    color: #fff;
+    background-color: #678;
+    border-color: #68a;
 }
 a.btn:hover {
-        transition: background-color 0.7s;
-        background-color: #d00;
-        border-color: #fff;
-        color: white !important;
+    transition: background-color 0.7s;
+    background-color: #d00;
+    border-color: #fff;
+    color: white !important;
 }
 
 
 body .banner {
-  color: white;
-  padding-top: 20px;
-  padding-bottom: 20px;
+    color: white;
+    padding-top: 20px;
+    padding-bottom: 20px;
 }
 #body_content .banner a {
-  color: white;
+    color: white;
 }
 
 
 .lang-slector {
-        float: right;
-        padding-top: 2mm;
-        padding-bottom: 4mm;
-        margin-left:  15px;
-        margin-right: 15px;
+    float: right;
+    padding-top: 2mm;
+    padding-bottom: 4mm;
+    margin-left:  15px;
+    margin-right: 15px;
 }
 
 html {
-        overflow-y: scroll;
+    overflow-y: scroll;
 }
 
 .dark {
-        background-color: #333;
+    background-color: #333;
 }
 
 .c_acronym {
-        background-color: #68a;
-        color: white;
+    background-color: #68a;
+    color: white;
 }
 
 
@@ -228,95 +228,95 @@ footer a:visited {
 }
 
 footer a:hover {
-  transition: background-color 0.3s;
-  background-color: rgba(100, 100, 100, 0.5);
+    transition: background-color 0.3s;
+    background-color: rgba(100, 100, 100, 0.5);
 }
 
 .c_intro {
-  min-height: 97vh;
+    min-height: 97vh;
 }
 
 /* don't show the language selector in the dropdown on mobile devices,
  * since it's in the top bar already.
  */
 .in .nav-lang {
-  display: none;
+    display: none;
 }
 
 .mobile-lang {
-  margin-left:5px;
-  margin-top: 8px;
+    margin-left:5px;
+    margin-top: 8px;
 }
 
 #mybody {
-  /* override ugly bootstrap defaults */
-  color: black;
+    /* override ugly bootstrap defaults */
+    color: black;
 }
 
 .btn-dark {
-        background-color: #999;
+    background-color: #999;
 }
 
 
 #mybody nav {
-        border-radius: 0px;
-        padding: 10px;
+    border-radius: 0px;
+    padding: 10px;
 }
 .index-logo {
-        text-align: center;
+    text-align: center;
 }
 
 footer {
-        padding-top: 2em;
-        margin-top: 2em;
-        background-color: #333;
-        color: white;
+    padding-top: 2em;
+    margin-top: 2em;
+    background-color: #333;
+    color: white;
 }
 
 #body_content .container-wide {
-        margin-bottom: 2em;
-        padding-top: 1em;
-        padding-bottom: 1em;
-        padding-left:  2em;
-        padding-right: 2em;
+    margin-bottom: 2em;
+    padding-top: 1em;
+    padding-bottom: 1em;
+    padding-left:  2em;
+    padding-right: 2em;
 }
 #body_content .container {
-        margin-bottom: 2em;
-        padding-top: 1em;
-        padding-bottom: 1em;
-        padding-left:  2em;
-        padding-right: 2em;
-        max-width: 80em;
+    margin-bottom: 2em;
+    padding-top: 1em;
+    padding-bottom: 1em;
+    padding-left:  2em;
+    padding-right: 2em;
+    max-width: 80em;
 }
 
 #body_content {
-  /* push footer down */
-  min-height: 80vh;
-  /* space for the nav */
-  padding-top: 70px;
+    /* push footer down */
+    min-height: 80vh;
+    /* space for the nav */
+    padding-top: 70px;
 }
 
 .adorn_h3_bracket h3::before {
-  content: "⊛";
-  color: #d00;
-  margin-right: 1em;
+    content: "⊛";
+    color: #d00;
+    margin-right: 1em;
 }
 
 .footer-list {
-  list-style: none;
+    list-style: none;
 }
 
 .cushion-above {
-  padding-top: 2em;
+    padding-top: 2em;
 }
 
 .cushion-below {
-  padding-bottom: 2em;
+    padding-bottom: 2em;
 }
 
 .invert {
-  -webkit-filter: invert(100%);
-  filter: invert(100%);
+    -webkit-filter: invert(100%);
+    filter: invert(100%);
 }
 
 #body_content .jumbotron {