diff options
| author | Shpuld Shpludson <shp@cock.li> | 2020-07-15 15:06:29 +0000 |
|---|---|---|
| committer | Shpuld Shpludson <shp@cock.li> | 2020-07-15 15:06:29 +0000 |
| commit | 0478e82bab84fc406fa7d45e0de91b0a50d8e413 (patch) | |
| tree | 48ac8d0b62d74f8740c247073cbd1b7f8a47998d | |
| parent | 1454d33e532b388204b0995d6632c1f7e1b76fb7 (diff) | |
| parent | 149941828f4cd751e20e8a94644567b89e0e61ea (diff) | |
Merge branch 'refactor/notification_settings_more' into 'develop'
Improve layout of the Notifications Filters section
See merge request pleroma/pleroma-fe!1192
| -rw-r--r-- | src/components/settings_modal/tabs/notifications_tab.vue | 15 | ||||
| -rw-r--r-- | src/i18n/en.json | 3 |
2 files changed, 6 insertions, 12 deletions
diff --git a/src/components/settings_modal/tabs/notifications_tab.vue b/src/components/settings_modal/tabs/notifications_tab.vue index eb9d5598..86eed3f5 100644 --- a/src/components/settings_modal/tabs/notifications_tab.vue +++ b/src/components/settings_modal/tabs/notifications_tab.vue @@ -2,16 +2,11 @@ <div :label="$t('settings.notifications')"> <div class="setting-item"> <h2>{{ $t('settings.notification_setting_filters') }}</h2> - <div class="select-multiple"> - <span class="label">{{ $t('settings.notification_setting') }}</span> - <ul class="option-list"> - <li> - <Checkbox v-model="notificationSettings.block_from_strangers"> - {{ $t('settings.notification_setting_block_from_strangers') }} - </Checkbox> - </li> - </ul> - </div> + <p> + <Checkbox v-model="notificationSettings.block_from_strangers"> + {{ $t('settings.notification_setting_block_from_strangers') }} + </Checkbox> + </p> </div> <div class="setting-item"> diff --git a/src/i18n/en.json b/src/i18n/en.json index 98834359..dc714bce 100644 --- a/src/i18n/en.json +++ b/src/i18n/en.json @@ -433,8 +433,7 @@ "greentext": "Meme arrows", "notifications": "Notifications", "notification_setting_filters": "Filters", - "notification_setting": "Block notifications from:", - "notification_setting_block_from_strangers": "Users who you do not follow", + "notification_setting_block_from_strangers": "Block notifications from users who you do not follow", "notification_setting_privacy": "Privacy", "notification_setting_hide_notification_contents": "Hide the sender and contents of push notifications", "notification_mutes": "To stop receiving notifications from a specific user, use a mute.", |