From 94d640f9f16c40a2586a00ecd774adbc977c06e0 Mon Sep 17 00:00:00 2001
From: Denys Nykula
Date: Mon, 1 May 2023 20:50:31 +0300
Subject: [PATCH 01/10] fix dropdown-item-icon and form controls using missing
variables
---
src/App.scss | 2 +-
src/components/popover/popover.vue | 2 +-
src/components/select/select.vue | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
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/components/popover/popover.vue b/src/components/popover/popover.vue
index c2a3e801..bd6284b3 100644
--- a/src/components/popover/popover.vue
+++ b/src/components/popover/popover.vue
@@ -114,7 +114,7 @@
svg {
width: 22px;
margin-right: 0.75rem;
- color: var(--menuPopoverIcon, $fallback--icon)
+ color: var(--popoverIcon, $fallback--icon)
}
}
diff --git a/src/components/select/select.vue b/src/components/select/select.vue
index 92493b0b..7b877ba4 100644
--- a/src/components/select/select.vue
+++ b/src/components/select/select.vue
@@ -38,7 +38,7 @@ label.Select {
margin: 0;
padding: 0 2em 0 .2em;
font-family: sans-serif;
- font-family: var(--inputFont, sans-serif);
+ font-family: var(--interfaceFont, sans-serif);
font-size: 1em;
width: 100%;
z-index: 1;
From 661a98d38dedbd2075d6d39b245f85b681fee80f Mon Sep 17 00:00:00 2001
From: Denys Nykula
Date: Mon, 1 May 2023 20:53:29 +0300
Subject: [PATCH 02/10] order bubble after public in sidebar like in other two
menus
---
.../timeline_menu/timeline_menu_content.vue | 32 +++++++++----------
1 file changed, 16 insertions(+), 16 deletions(-)
diff --git a/src/components/timeline_menu/timeline_menu_content.vue b/src/components/timeline_menu/timeline_menu_content.vue
index bb170b82..7c351721 100644
--- a/src/components/timeline_menu/timeline_menu_content.vue
+++ b/src/components/timeline_menu/timeline_menu_content.vue
@@ -16,22 +16,6 @@
>{{ $t("nav.home_timeline") }}
-
-
-
+
+
+
({
+ key: mode,
+ value: mode,
+ label: this.$t(`settings.user_accepts_direct_messages_from_${mode}`)
+ }))
}
},
components: {
+ ChoiceSetting,
ScopeSelector,
ImageCropper,
EmojiInput,
@@ -126,7 +134,8 @@ const ProfileTab = {
fields_attributes: this.newFields.filter(el => el != null),
bot: this.bot,
show_role: this.showRole,
- status_ttl_days: this.expirePosts ? this.newPostTTLDays : -1
+ status_ttl_days: this.expirePosts ? this.newPostTTLDays : -1,
+ accepts_direct_messages_from: this.userAcceptsDirectMessagesFrom
/* eslint-enable camelcase */
}
diff --git a/src/components/settings_modal/tabs/profile_tab.vue b/src/components/settings_modal/tabs/profile_tab.vue
index 8748b685..9f80582f 100644
--- a/src/components/settings_modal/tabs/profile_tab.vue
+++ b/src/components/settings_modal/tabs/profile_tab.vue
@@ -89,6 +89,15 @@
{{ $t('settings.bot') }}
+
+
+ {{ $t('settings.user_accepts_direct_messages_from') }}
+
+
{{ $t('settings.expire_posts_enabled') }}
@@ -102,6 +111,9 @@
class="expire-posts-days"
:placeholder="$t('settings.expire_posts_input_placeholder')"
/>
+
+
+
{
output.friends_count = data.following_count
output.bot = data.bot
+ output.accepts_direct_messages_from = data.accepts_direct_messages_from
output.follow_requests_count = data.follow_requests_count
if (data.akkoma) {
output.instance = data.akkoma.instance