diff --git a/src/components/desktop_nav/desktop_nav.js b/src/components/desktop_nav/desktop_nav.js index 1837ee3d..71553432 100644 --- a/src/components/desktop_nav/desktop_nav.js +++ b/src/components/desktop_nav/desktop_nav.js @@ -75,7 +75,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.vue b/src/components/desktop_nav/desktop_nav.vue index c63a8161..61db5764 100644 --- a/src/components/desktop_nav/desktop_nav.vue +++ b/src/components/desktop_nav/desktop_nav.vue @@ -12,9 +12,13 @@ :to="{ name: 'root' }" active-class="home" > - + {{ sitename }} diff --git a/src/components/mobile_nav/mobile_nav.js b/src/components/mobile_nav/mobile_nav.js index 713fd37b..7a356921 100644 --- a/src/components/mobile_nav/mobile_nav.js +++ b/src/components/mobile_nav/mobile_nav.js @@ -41,7 +41,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 } }, methods: { diff --git a/src/components/mobile_nav/mobile_nav.vue b/src/components/mobile_nav/mobile_nav.vue index 3583ab3c..308c8d57 100644 --- a/src/components/mobile_nav/mobile_nav.vue +++ b/src/components/mobile_nav/mobile_nav.vue @@ -22,7 +22,7 @@ /> +
  • + + {{ $t('settings.hide_site_favicon') }} + +
  • +
  • + + {{ $t('settings.hide_site_name') }} + +
  • {{ $t('settings.stop_gifs') }} diff --git a/src/i18n/en.json b/src/i18n/en.json index 9dbe4ea8..65df915b 100644 --- a/src/i18n/en.json +++ b/src/i18n/en.json @@ -425,6 +425,9 @@ "right_sidebar": "Reverse order of columns", "always_show_post_button": "Always show floating New Post button", "hide_threads_with_blocked_users": "Hide threads tagging blocked users", + "hide_site_favicon": "Hide instance favicon in top panel", + "hide_site_name": "Hide instance name in top panel", + "hide_user_stats": "Hide user statistics (e.g. the number of followers)", "hide_wallpaper": "Hide instance wallpaper", "preload_images": "Preload images", "use_one_click_nsfw": "Open NSFW attachments with just one click", diff --git a/src/modules/config.js b/src/modules/config.js index e0cba098..5fbbe44c 100644 --- a/src/modules/config.js +++ b/src/modules/config.js @@ -36,6 +36,8 @@ export const defaultState = { muteBotStatuses: undefined, // instance default collapseMessageWithSubject: true, // instance default padEmoji: true, + hideSiteFavicon: undefined, // instance default + hideSiteName: undefined, // instance default hideAttachments: false, hideAttachmentsInConv: false, maxThumbnails: 16, diff --git a/src/modules/instance.js b/src/modules/instance.js index 1ab6365f..ef6e3074 100644 --- a/src/modules/instance.js +++ b/src/modules/instance.js @@ -34,7 +34,8 @@ const defaultState = { hideWordFilteredPosts: false, hidePostStats: false, hideBotIndication: false, - hideSitename: false, + hideSiteFavicon: false, + hideSiteName: false, hideUserStats: false, muteBotStatuses: false, loginMethod: 'password',