diff --git a/src/App.scss b/src/App.scss
index 38574cab..36176b35 100644
--- a/src/App.scss
+++ b/src/App.scss
@@ -469,7 +469,7 @@ textarea,
color: $fallback--lightText;
color: var(--inputText, $fallback--lightText);
font-family: sans-serif;
- font-family: var(--inputFont, sans-serif);
+ font-family: var(--interfaceFont, sans-serif);
font-size: 1em;
margin: 0;
box-sizing: border-box;
diff --git a/src/boot/after_store.js b/src/boot/after_store.js
index b48bfb09..d45584c0 100644
--- a/src/boot/after_store.js
+++ b/src/boot/after_store.js
@@ -323,6 +323,7 @@ const getNodeInfo = async ({ store }) => {
})
store.dispatch('setInstanceOption', { name: 'publicTimelineVisibility', value: metadata.publicTimelineVisibility })
+ store.dispatch('setInstanceOption', { name: 'federatedTimelineAvailable', value: metadata.federatedTimelineAvailable })
const accountActivationRequired = metadata.accountActivationRequired
store.dispatch('setInstanceOption', { name: 'accountActivationRequired', value: accountActivationRequired })
diff --git a/src/components/desktop_nav/desktop_nav.js b/src/components/desktop_nav/desktop_nav.js
index 4cf5a477..d7538f5b 100644
--- a/src/components/desktop_nav/desktop_nav.js
+++ b/src/components/desktop_nav/desktop_nav.js
@@ -1,6 +1,11 @@
import SearchBar from 'components/search_bar/search_bar.vue'
import ConfirmModal from '../confirm_modal/confirm_modal.vue'
import { library } from '@fortawesome/fontawesome-svg-core'
+import {
+ publicTimelineVisible,
+ federatedTimelineVisible,
+ bubbleTimelineVisible,
+} from '../../lib/timeline_visibility'
import {
faSignInAlt,
faSignOutAlt,
@@ -106,7 +111,9 @@ export default {
return this.$store.state.instance.localBubbleInstances.length > 0
},
...mapState({
- publicTimelineVisibility: state => state.instance.publicTimelineVisibility,
+ publicTimelineVisible,
+ federatedTimelineVisible,
+ bubbleTimelineVisible,
})
},
methods: {
diff --git a/src/components/desktop_nav/desktop_nav.vue b/src/components/desktop_nav/desktop_nav.vue
index a41e9972..f50d1b3e 100644
--- a/src/components/desktop_nav/desktop_nav.vue
+++ b/src/components/desktop_nav/desktop_nav.vue
@@ -46,7 +46,7 @@
@@ -70,7 +70,7 @@
state.users.currentUser,
privateMode: state => state.instance.private,
federating: state => state.instance.federating,
- showBubbleTimeline: state => (state.instance.localBubbleInstances.length > 0),
- publicTimelineVisibility: state => state.instance.publicTimelineVisibility,
+ publicTimelineVisible,
+ federatedTimelineVisible,
+ bubbleTimelineVisible,
})
}
}
diff --git a/src/components/timeline_menu/timeline_menu_content.vue b/src/components/timeline_menu/timeline_menu_content.vue
index 0144f2fd..7c351721 100644
--- a/src/components/timeline_menu/timeline_menu_content.vue
+++ b/src/components/timeline_menu/timeline_menu_content.vue
@@ -16,23 +16,7 @@
>{{ $t("nav.home_timeline") }}
-
-
-
-
+
-
+
+
+
+
-
+
-
+
-
+