diff --git a/src/components/desktop_nav/desktop_nav.js b/src/components/desktop_nav/desktop_nav.js
index 72b984c2..7df43e6b 100644
--- a/src/components/desktop_nav/desktop_nav.js
+++ b/src/components/desktop_nav/desktop_nav.js
@@ -80,7 +80,16 @@ export default {
})
},
logo () { return this.$store.state.instance.logo },
+ mergedConfig () {
+ return this.$store.getters.mergedConfig
+ },
sitename () { return this.$store.state.instance.name },
+ hideSiteFavicon () {
+ return this.mergedConfig.hideSiteFavicon
+ },
+ hideSiteName () {
+ return this.mergedConfig.hideSiteName
+ },
hideSitename () { return this.$store.state.instance.hideSitename },
logoLeft () { return this.$store.state.instance.logoLeft },
currentUser () { return this.$store.state.users.currentUser },
diff --git a/src/components/desktop_nav/desktop_nav.scss b/src/components/desktop_nav/desktop_nav.scss
index 255b4c36..9fed26f3 100644
--- a/src/components/desktop_nav/desktop_nav.scss
+++ b/src/components/desktop_nav/desktop_nav.scss
@@ -109,6 +109,11 @@
}
}
+ .svg-inline--fa {
+ color: $fallback--link;
+ color: var(--topBarLink, $fallback--link);
+ }
+
.nav-icon {
margin-left: 0.7em;
width: 2em;
@@ -123,6 +128,7 @@
font-weight: bolder;
color: $fallback--text;
color: var(--selectedMenuText, $fallback--text);
+
--lightText: var(--selectedMenuLightText, $fallback--lightText);
}
}
@@ -130,11 +136,6 @@
&-logout {
margin-left: 2em;
}
-
- .svg-inline--fa {
- color: $fallback--link;
- color: var(--topBarLink, $fallback--link);
- }
}
.left {
diff --git a/src/components/desktop_nav/desktop_nav.vue b/src/components/desktop_nav/desktop_nav.vue
index 21a0f33b..80bbfe59 100644
--- a/src/components/desktop_nav/desktop_nav.vue
+++ b/src/components/desktop_nav/desktop_nav.vue
@@ -13,11 +13,12 @@
active-class="home"
>
{{ sitename }}
diff --git a/src/components/mobile_nav/mobile_nav.js b/src/components/mobile_nav/mobile_nav.js
index dad1f6aa..ef973981 100644
--- a/src/components/mobile_nav/mobile_nav.js
+++ b/src/components/mobile_nav/mobile_nav.js
@@ -52,7 +52,12 @@ const MobileNav = {
unseenNotificationsCount () {
return this.unseenNotifications.length
},
- hideSitename () { return this.$store.state.instance.hideSitename },
+ mergedConfig () {
+ return this.$store.getters.mergedConfig
+ },
+ hideSiteName () {
+ return this.mergedConfig.hideSiteName
+ },
sitename () { return this.$store.state.instance.name },
isChat () {
return this.$route.name === 'chat'
diff --git a/src/components/mobile_nav/mobile_nav.vue b/src/components/mobile_nav/mobile_nav.vue
index c2746abe..483611b7 100644
--- a/src/components/mobile_nav/mobile_nav.vue
+++ b/src/components/mobile_nav/mobile_nav.vue
@@ -23,8 +23,16 @@
class="alert-dot"
/>
-
-
+
+ {{ sitename }}
+
+
+