From f56177ba6f2deb9ba79703489da7084fa5b276fc Mon Sep 17 00:00:00 2001
From: Mike Thomas <78363703+mike-j-thomas@users.noreply.github.com>
Date: Sat, 27 Aug 2022 00:53:31 +0900
Subject: [PATCH] Update Community nav on layout.ejs (#7411)

* Update Community nav on layout.ejs

- Re-ordered articles
- Added Contribute to Fleet
- Renamed "Chat" to "Join the conversation." My theory is that users may misunderstand "Chat" as being online chat with the team, rather than the community Slack.

* Update bootstrap-overrides.less

Co-authored-by: Eric <eashaw@sailsjs.com>
---
 .../assets/styles/bootstrap-overrides.less    |  2 +-
 website/views/layouts/layout.ejs              | 24 ++++++++++---------
 2 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/website/assets/styles/bootstrap-overrides.less b/website/assets/styles/bootstrap-overrides.less
index f98b5af7fc..ed35e743c9 100644
--- a/website/assets/styles/bootstrap-overrides.less
+++ b/website/assets/styles/bootstrap-overrides.less
@@ -201,7 +201,7 @@ a.text-danger:hover, a.text-danger:focus {
     opacity: 1;
     pointer-events: auto;
     z-index: 3;
-    overflow-y: scroll;
+    overflow-y: auto;
   }
   .collapse {
     opacity: 0;
diff --git a/website/views/layouts/layout.ejs b/website/views/layouts/layout.ejs
index 391a26b5e3..f5fbc9b44c 100644
--- a/website/views/layouts/layout.ejs
+++ b/website/views/layouts/layout.ejs
@@ -166,13 +166,14 @@
               <a purpose="mobile-dropdown-toggle" class="d-flex align-items-center mr-4 collapsed" data-toggle="collapse" data-target="#mobileNavbarToggleCommunity">Community</a>
               <div class="d-block">
                 <div id="mobileNavbarToggleCommunity" purpose="mobile-dropdown" class="collapse" data-parent="#mobileDropdowns">
-                  <a href="/slack" target="_blank">Chat</a>
-                  <a href="/podcasts">Podcasts</a>
-                  <a href="/reports/state-of-device-management">State of device management</a>
-                  <span>ARTICLES</span>
+                  <a href="/announcements">Announcements</a>
                   <a href="/securing">Security</a>
                   <a href="/engineering">Engineering</a>
-                  <a href="/announcements">Announcements</a>
+                  <a href="/podcasts">Podcasts</a>
+                  <a href="/reports/state-of-device-management">Reports</a>
+                  <span>RESOURCES</span>
+                  <a href="/slack" target="_blank">Join the conversation</a>
+                  <a href="/contribute">Contribute to Fleet</a>
                   <span>RESOURCES</span>
                   <a href="/handbook">Handbook</a>
                   <a href="/logos">Logos & artwork</a>
@@ -215,14 +216,15 @@
             <div purpose="dropdown-button" class="btn-group">
               <a class="dropdown-toggle d-flex align-items-center py-2 px-3" data-toggle="dropdown">Community</a>
               <div purpose="header-dropdown" class="dropdown-menu">
-                <a class="dropdown-item mb-1" href="/slack" target="_blank">Chat</a>
-                <a class="dropdown-item mb-1" href="/podcasts">Podcasts</a>
-                <a class="dropdown-item mb-1" href="/reports/state-of-device-management">State of device management</a>
-                <div class="dropdown-divider"></div>
-                <span class="muted dropdown-header">ARTICLES</span>
+                <a class="dropdown-item mb-1" href="/announcements">Announcements</a>
                 <a class="dropdown-item mb-1" href="/securing">Security</a>
                 <a class="dropdown-item mb-1" href="/engineering">Engineering</a>
-                <a class="dropdown-item mb-1" href="/announcements">Announcements</a>
+                <a class="dropdown-item mb-1" href="/podcasts">Podcasts</a>
+                <a class="dropdown-item mb-1" href="/reports/state-of-device-management">Reports</a>
+                <div class="dropdown-divider"></div>
+                <span class="muted dropdown-header">CONTRIBUTE</span>
+                <a class="dropdown-item mb-1" href="/slack" target="_blank">Join the conversation</a>
+                <a class="dropdown-item mb-1" href="/contribute">Contribute to Fleet</a>
                 <div class="dropdown-divider"></div>
                 <span class="muted dropdown-header">RESOURCES</span>
                 <a class="dropdown-item mb-1" href="/handbook">Handbook</a>