From b73c0e53aa57f6062265da5a393c0db705ef7e97 Mon Sep 17 00:00:00 2001
From: LieutenantRoger <gair_2015@hotmail.com>
Date: Wed, 15 Jan 2020 11:01:34 +0800
Subject: [PATCH 1/2] Fix Issue2457
---
src/components/TopNav/MobileSubNav.module.scss | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/components/TopNav/MobileSubNav.module.scss b/src/components/TopNav/MobileSubNav.module.scss
index 991d364..64abb72 100644
--- a/src/components/TopNav/MobileSubNav.module.scss
+++ b/src/components/TopNav/MobileSubNav.module.scss
@@ -23,6 +23,7 @@
.mobileSubNavOpen & {
display: block;
+ color: $turquoise;
}
}
From 99ddf1943c88312ea4503ce18e4fc39c9104bfd8 Mon Sep 17 00:00:00 2001
From: LieutenantRoger <gair_2015@hotmail.com>
Date: Mon, 20 Jan 2020 12:58:47 +0800
Subject: [PATCH 2/2] Fix menu color
---
src/components/TopNav/MobileSubNav.module.scss | 1 -
src/components/TopNav/PrimaryNav.js | 2 +-
2 files changed, 1 insertion(+), 2 deletions(-)
diff --git a/src/components/TopNav/MobileSubNav.module.scss b/src/components/TopNav/MobileSubNav.module.scss
index 64abb72..991d364 100644
--- a/src/components/TopNav/MobileSubNav.module.scss
+++ b/src/components/TopNav/MobileSubNav.module.scss
@@ -23,7 +23,6 @@
.mobileSubNavOpen & {
display: block;
- color: $turquoise;
}
}
diff --git a/src/components/TopNav/PrimaryNav.js b/src/components/TopNav/PrimaryNav.js
index cb95a0c..31a2c4e 100644
--- a/src/components/TopNav/PrimaryNav.js
+++ b/src/components/TopNav/PrimaryNav.js
@@ -54,7 +54,7 @@ const PrimaryNav = ({
<span className={styles.primaryLevel1Separator} key={`separator-${i}`} />,
/* Level 1 menu item */
<a
- className={cn(styles.primaryLevel1, !activeLevel2Id && level1.id === activeLevel1Id && styles.primaryLevel1Open, level1.mobileOnly && styles.mobileOnly)}
+ className={cn(styles.primaryLevel1, (!activeLevel2Id || showLeftMenu) && level1.id === activeLevel1Id && styles.primaryLevel1Open, level1.mobileOnly && styles.mobileOnly)}
href={level1.href}
key={`level1-${i}`}
onClick={createHandleClickLevel1(level1.id, true)}