From d7749fdaa87e7136e9196f7d3bfc0e1cf4ef8aa4 Mon Sep 17 00:00:00 2001
From: George Cushen <gcushen@users.noreply.github.com>
Date: Mon, 18 Nov 2019 23:10:53 +0000
Subject: [PATCH] fix: theme's menu_text_active stopped working

Fix #1430
---
 assets/scss/academic/_nav.scss | 6 +++++-
 layouts/partials/navbar.html   | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/assets/scss/academic/_nav.scss b/assets/scss/academic/_nav.scss
index 9745e514..30007f4d 100644
--- a/assets/scss/academic/_nav.scss
+++ b/assets/scss/academic/_nav.scss
@@ -42,6 +42,7 @@
 
       &.active {
         font-weight: bold !important;
+        color: $sta-menu-text-active !important;
       }
     }
   }
@@ -50,8 +51,11 @@
     font-size: #{$sta-font-size-small}px;
   }
 
-  .dropdown-item.active {
+  // Note: dedicated `i18n-active` class to prevent ScrollSpy removing `active` class from language chooser.
+  .dropdown-item.active,
+  .i18n-active {
     font-weight: bold;
+    color: $sta-menu-text-active !important;
   }
 
 }
diff --git a/layouts/partials/navbar.html b/layouts/partials/navbar.html
index e07f13fd..dd18fb5e 100644
--- a/layouts/partials/navbar.html
+++ b/layouts/partials/navbar.html
@@ -121,7 +121,7 @@
           <i class="fas fa-globe mr-1" aria-hidden="true"></i><span class="d-none d-lg-inline">{{ index site.Data.i18n.languages .Lang }}</span>
         </a>
         <div class="dropdown-menu">
-          <div class="dropdown-item active font-weight-bold">
+          <div class="dropdown-item i18n-active font-weight-bold">
             <span>{{ index site.Data.i18n.languages .Lang }}</span>
           </div>
           {{ range .Translations }}