From 9b8eabaa00b73b50b156a4d90df5cc1618117829 Mon Sep 17 00:00:00 2001
From: Matthew Stone <junkmail@sandboxstudio.net>
Date: Wed, 15 Mar 2023 10:15:51 -0500
Subject: [PATCH 1/5] Remove active class in nav from posts and events

---
 app/views/layouts/_navbar.html.erb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/views/layouts/_navbar.html.erb b/app/views/layouts/_navbar.html.erb
index 05638d8f..6718365e 100644
--- a/app/views/layouts/_navbar.html.erb
+++ b/app/views/layouts/_navbar.html.erb
@@ -115,11 +115,11 @@
               <li><a href="/items">View All Resources</a></li>
             </ul>
           </li>
-          <li class="nav-item <% if (defined? page.slug) && (page.slug == 'bssw-blog') || controller.controller_name == 'blog_posts' =%>active<% end %>">
+          <li class="nav-item <% if (defined? page.slug) && (page.slug == 'bssw-blog') =%>active<% end %>">
             <a class="nav-link" href="/blog_posts">Blog</a>
           </li>
 
-          <li class="nav-item <% if (defined? page.slug) && (page.slug == 'upcoming-events') || controller.controller_name == 'events' =%>active<% end %>">
+          <li class="nav-item <% if (defined? page.slug) && (page.slug == 'upcoming-events') =%>active<% end %>">
             <a class="nav-link" href="/events">Events</a>
           </li>
           <!--

From e661f9a7c6b1e8844b5312f3405c1d1e6c5b047c Mon Sep 17 00:00:00 2001
From: Matthew Stone <junkmail@sandboxstudio.net>
Date: Wed, 15 Mar 2023 10:21:01 -0500
Subject: [PATCH 2/5] Change color of active link

---
 app/assets/stylesheets/_trey.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/assets/stylesheets/_trey.scss b/app/assets/stylesheets/_trey.scss
index c7cbb986..214ec9ac 100755
--- a/app/assets/stylesheets/_trey.scss
+++ b/app/assets/stylesheets/_trey.scss
@@ -278,7 +278,7 @@
     }
 
     .navbar-dark .navbar-nav .active>.nav-link, .navbar-dark .navbar-nav .nav-link.active, .navbar-dark .navbar-nav .nav-link.show, .navbar-dark .navbar-nav .show>.nav-link {
-        color:#18187d;
+        color:#b9ffff;
         background:#349dff;
     }
 

From 3a220568d6b6b29cd400f84290a6ab41e8a13116 Mon Sep 17 00:00:00 2001
From: Matthew Stone <junkmail@sandboxstudio.net>
Date: Wed, 15 Mar 2023 10:22:41 -0500
Subject: [PATCH 3/5] Change color of active link

Looks like it's specified twice
---
 app/assets/stylesheets/bssw.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/assets/stylesheets/bssw.scss b/app/assets/stylesheets/bssw.scss
index 84265495..068ed044 100644
--- a/app/assets/stylesheets/bssw.scss
+++ b/app/assets/stylesheets/bssw.scss
@@ -114,7 +114,7 @@
 }
 
 .navbar-dark .navbar-nav .active>.nav-link, .navbar-dark .navbar-nav .nav-link.active, .navbar-dark .navbar-nav .nav-link.show, .navbar-dark .navbar-nav .show>.nav-link {
-    color:#18187d;
+    color:#b9ffff;
     background:#349dff;
 }
 

From 1513f095def1ce6e3e9b0ed40c3019668d615069 Mon Sep 17 00:00:00 2001
From: Matthew Stone <junkmail@sandboxstudio.net>
Date: Tue, 21 Mar 2023 10:09:35 -0500
Subject: [PATCH 4/5] Update color of active navbar link

---
 app/assets/stylesheets/application.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss
index e7107abb..06c2fa27 100644
--- a/app/assets/stylesheets/application.scss
+++ b/app/assets/stylesheets/application.scss
@@ -524,7 +524,7 @@ body:not(.scrollup) .sm-logo-div {
   }
   .navbar-nav {
     .active > .nav-link {
-      color: #18187d;
+      color: #b9ffff;
       background: #349dff;
     }
     .nav-link {

From 82c1fb65e055e54e5afbf305ef21c53d336aa03b Mon Sep 17 00:00:00 2001
From: Matthew Stone <junkmail@sandboxstudio.net>
Date: Fri, 24 Mar 2023 13:30:35 -0500
Subject: [PATCH 5/5] change to hover color in main nav

---
 app/assets/stylesheets/application.scss | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss
index 06c2fa27..530c54d8 100644
--- a/app/assets/stylesheets/application.scss
+++ b/app/assets/stylesheets/application.scss
@@ -192,6 +192,7 @@ NAVIGATION
       outline: none;
       &:hover {
         background: #349dff;
+	color: #b9ffff;
       }
     }
     .active > .nav-link {