From 325f978b5f9d94deef8988617eb16a6cd97f0cbe Mon Sep 17 00:00:00 2001
From: scragly <29337040+scragly@users.noreply.github.com>
Date: Fri, 23 Oct 2020 21:52:54 +1000
Subject: Change discord img-based link to normal nav item.

---
 pydis_site/static/css/base/base.css   | 18 ++++++++++++------
 pydis_site/templates/base/navbar.html | 11 +++--------
 2 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/pydis_site/static/css/base/base.css b/pydis_site/static/css/base/base.css
index dc7c504d..42bbc8cf 100644
--- a/pydis_site/static/css/base/base.css
+++ b/pydis_site/static/css/base/base.css
@@ -30,16 +30,22 @@ div.card.has-equal-height {
     background-color: transparent;
 }
 
-.navbar-item.has-left-margin-1 {
-    margin-left: 1rem;
+.navbar-link:not(.is-arrowless) {
+    padding-left: 2rem;
+    padding-right: 3.5em;
 }
 
-.navbar-item.has-left-margin-2 {
-    margin-left: 2rem;
+.navbar-link:not(.is-arrowless)::after {
+    right: 2em;
+    margin-top: -0.42em;
 }
 
-.navbar-item.has-left-margin-3 {
-    margin-left: 3rem;
+/* Dropdown nav needs to be viewable at edge of canvas */
+@media screen and (min-width: 1024px) {
+    .navbar-dropdown {
+        left: unset;
+        right: 0;
+    }
 }
 
 #navbar-banner {
diff --git a/pydis_site/templates/base/navbar.html b/pydis_site/templates/base/navbar.html
index c2915025..9453c7b5 100644
--- a/pydis_site/templates/base/navbar.html
+++ b/pydis_site/templates/base/navbar.html
@@ -20,8 +20,8 @@
   <div class="navbar-menu is-paddingless" id="navbar_menu">
     <div class="navbar-end">
 
-      {# Discord invite - only visible in the hamburger on mobile sizes. #}
-      <a class="navbar-item is-hidden-desktop" href="https://discord.gg/python">
+      {# Discord #}
+      <a class="navbar-item" href="https://discord.gg/python">
         <span class="icon is-size-4 is-medium"><i class="fab fa-discord"></i></span>
         <span>&nbsp;Discord</span>
       </a>
@@ -57,7 +57,7 @@
       </a>
 
       {# More #}
-      <div class="navbar-item has-dropdown is-hoverable has-left-margin-1">
+      <div class="navbar-item has-dropdown is-hoverable">
         <a class="navbar-link">
           More
         </a>
@@ -123,11 +123,6 @@
         </div>
       </div>
     </div>
-
-    {# Join us on Discord! #}
-    <a class="navbar-item is-fullsize has-no-highlight has-left-margin-1" href="https://discord.gg/python">
-      <img class="is-hidden-touch" src="{% static "images/navbar/navbar_discordjoin.svg" %}" alt="Join us on Discord!"/>
-    </a>
   </div>
 </nav>
 
-- 
cgit v1.2.3