From 53c9f80514980ebc762692a8880d3cae311481bb Mon Sep 17 00:00:00 2001
From: Tobias <tobias@localhost.localdomain>
Date: Sun, 7 Oct 2018 09:42:47 +1300
Subject: [PATCH] Nav fixes

---
 pinaxcon/templates/nav.html             | 17 ++++-------------
 pinaxcon/templates/sitetree_header.html |  2 +-
 static/src/scss/app.scss                |  7 +------
 3 files changed, 6 insertions(+), 20 deletions(-)

diff --git a/pinaxcon/templates/nav.html b/pinaxcon/templates/nav.html
index fa41f904..a941ea2e 100644
--- a/pinaxcon/templates/nav.html
+++ b/pinaxcon/templates/nav.html
@@ -9,14 +9,14 @@
     <img src="{% static 'assets/LCA_logo.svg' %}" alt="LCA2019 Logo">
     {% endif %}
   </a>
-  
+
   <button class="navbar-toggler {% if color == 'green' %}white{% else %}green{% endif %}-toggler" type="button" data-toggle="collapse" data-target="#navbarNavDropdown" aria-controls="navbarNavDropdown" aria-expanded="false" aria-label="Toggle navigation">
     <span class="navbar-toggler-icon"></span>
   </button>
 
   {% sitetree_menu from "main" include "trunk" template "sitetree_header.html" %}
-  
-  <!-- <ul class="navbar-nav flex-row ml-md-auto d-none d-md-flex">
+
+  <ul class="navbar-nav flex-row ml-md-auto d-none d-md-flex ml-3">
     <li class="nav-item">
       <a class="nav-link" href="https://twitter.com/linuxconfau2019" target="_blank" rel="noopener" aria-label="Twitter">
         <svg class="navbar-nav-svg {% if color == 'green' %} text-white{% endif %}" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 416.32" focusable="false"><title>Twitter</title>
@@ -24,14 +24,5 @@
         </svg>
       </a>
     </li>
-    <li class="nav-item">
-      <a class="nav-link" href="https://twitter.com/linuxconfau2019" target="_blank" rel="noopener" aria-label="Twitter">
-        {% if color == 'green' %}
-        <img src="{% static 'assets/tux_white.svg' %}" alt="Tux" class="navbar-nav-svg">
-        {% else %}
-        <img src="{% static 'assets/tux.svg' %}" alt="Tux" class="navbar-nav-svg">
-        {% endif %}
-      </a>
-    </li>
-  </ul> -->
+  </ul>
 </nav>
diff --git a/pinaxcon/templates/sitetree_header.html b/pinaxcon/templates/sitetree_header.html
index 0668a9f0..80ec3b5e 100644
--- a/pinaxcon/templates/sitetree_header.html
+++ b/pinaxcon/templates/sitetree_header.html
@@ -20,7 +20,7 @@
       </a>
     </li>
     {% endif %}
-    {% endif %} 
+    {% endif %}
     {% endfor %}
   </ul>
 </div>
\ No newline at end of file
diff --git a/static/src/scss/app.scss b/static/src/scss/app.scss
index d52290e3..8b494cf1 100644
--- a/static/src/scss/app.scss
+++ b/static/src/scss/app.scss
@@ -21,7 +21,6 @@ body {
 }
 
 
-
 .text-page {
     h2 {
         padding-top: 3rem;
@@ -37,10 +36,6 @@ body {
     text-transform: uppercase;
 }
 
-.navbar-collapse {
-    margin-left: $padding-left-default;
-}
-
 
 .navbar-toggler {
     border: 0 !important;
@@ -110,7 +105,7 @@ footer {
 }
 
 li.nav-item {
-    height: 2.75rem;
+    min-height: 2.75rem;
 
     &.active > a.nav-link {
         font-weight: 700;