diff --git a/src/components/list/list.vue b/src/components/list/list.vue
index c3e041201..c092da339 100644
--- a/src/components/list/list.vue
+++ b/src/components/list/list.vue
@@ -73,9 +73,9 @@
/>
{{ $t('general.more') }}
diff --git a/src/components/moderation_tools/moderation_tools.vue b/src/components/moderation_tools/moderation_tools.vue
index 43612c693..4da0be0ee 100644
--- a/src/components/moderation_tools/moderation_tools.vue
+++ b/src/components/moderation_tools/moderation_tools.vue
@@ -46,13 +46,19 @@
:disabled="disabled"
>
{{ $t('user_card.admin_menu.moderation') }}
-
-
+
+
+ />
@@ -91,7 +97,10 @@
{{ $t(confirmDialogContent2) }}
- -
+
-
{{ user.screen_name }}
diff --git a/src/components/settings_modal/admin_tabs/admin_user_card.vue b/src/components/settings_modal/admin_tabs/admin_user_card.vue
index cf3062b09..00405dfa1 100644
--- a/src/components/settings_modal/admin_tabs/admin_user_card.vue
+++ b/src/components/settings_modal/admin_tabs/admin_user_card.vue
@@ -18,8 +18,8 @@
{{ ' ' }}
{{ $t('general.not_available') }}
@@ -35,7 +35,7 @@
{{ $t('user_card.admin_data.registration_reason') }}
- {{ user.adminData.registration_reason }}
+ {{ user.adminData.registration_reason }}
diff --git a/src/components/settings_modal/admin_tabs/users_tab.vue b/src/components/settings_modal/admin_tabs/users_tab.vue
index a12c76ddd..fcc9e9df1 100644
--- a/src/components/settings_modal/admin_tabs/users_tab.vue
+++ b/src/components/settings_modal/admin_tabs/users_tab.vue
@@ -123,9 +123,9 @@
diff --git a/src/components/settings_modal/helpers/vertical_tab_switcher.scss b/src/components/settings_modal/helpers/vertical_tab_switcher.scss
index 4c0e94dff..8db960914 100644
--- a/src/components/settings_modal/helpers/vertical_tab_switcher.scss
+++ b/src/components/settings_modal/helpers/vertical_tab_switcher.scss
@@ -58,6 +58,7 @@
&.-full-height {
height: 100%;
+
> * {
height: 100%;
}
diff --git a/src/components/settings_modal/tabs/mutes_and_blocks_tab.vue b/src/components/settings_modal/tabs/mutes_and_blocks_tab.vue
index 598fb53f8..5b8066ef7 100644
--- a/src/components/settings_modal/tabs/mutes_and_blocks_tab.vue
+++ b/src/components/settings_modal/tabs/mutes_and_blocks_tab.vue
@@ -2,7 +2,7 @@
+ >
-
+
- {{ $t('status.mark_as_non-sensitive') }}
+ {{ $t('status.mark_as_non-sensitive') }}
- {{ $t('status.mark_as_sensitive') }}
+ {{ $t('status.mark_as_sensitive') }}
diff --git a/src/components/user_card/user_card.vue b/src/components/user_card/user_card.vue
index cdea958af..af779823c 100644
--- a/src/components/user_card/user_card.vue
+++ b/src/components/user_card/user_card.vue
@@ -348,8 +348,8 @@
@@ -454,7 +454,7 @@
:key="tag"
>
- {{ tag }}
+ {{ tag }}
{{ ' ' }}
diff --git a/src/components/user_profile/user_profile.js b/src/components/user_profile/user_profile.js
index 3d8db1b25..d2d766a7f 100644
--- a/src/components/user_profile/user_profile.js
+++ b/src/components/user_profile/user_profile.js
@@ -204,7 +204,6 @@ const UserProfile = {
List,
FollowCard,
TabSwitcher,
- Conversation,
},
}
diff --git a/src/components/user_profile/user_profile_admin_view.vue b/src/components/user_profile/user_profile_admin_view.vue
index 992ce3b4b..47a23dd35 100644
--- a/src/components/user_profile/user_profile_admin_view.vue
+++ b/src/components/user_profile/user_profile_admin_view.vue
@@ -10,15 +10,18 @@
hide-bio
hide-buttons
/>
-
+
{{ $t('admin_dash.users.godmode') }}