diff options
| author | Shpuld Shpludson <shp@cock.li> | 2019-04-15 18:21:52 +0000 |
|---|---|---|
| committer | Shpuld Shpludson <shp@cock.li> | 2019-04-15 18:21:52 +0000 |
| commit | efa93d0829dc703c560115cf5c7d15985bce915e (patch) | |
| tree | 55c5a16a39363ed6f0f79a24e6f692b655cad4ff /src/components/user_settings/user_settings.vue | |
| parent | 936eb23bdfeaf40c4844b9e75e083d21bdd9b4d1 (diff) | |
| parent | 329dc833b3d2a4bb36e487bcd420b880865c185a (diff) | |
Merge branch '227-quick-add' into 'develop'
Support user searching to mute/block directly in the mutes/blocks tab
See merge request pleroma/pleroma-fe!727
Diffstat (limited to 'src/components/user_settings/user_settings.vue')
| -rw-r--r-- | src/components/user_settings/user_settings.vue | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/src/components/user_settings/user_settings.vue b/src/components/user_settings/user_settings.vue index c08698dc..9d37ffc4 100644 --- a/src/components/user_settings/user_settings.vue +++ b/src/components/user_settings/user_settings.vue @@ -22,7 +22,7 @@ <div class="setting-item" > <h2>{{$t('settings.name_bio')}}</h2> <p>{{$t('settings.name')}}</p> - <EmojiInput + <EmojiInput type="text" v-model="newName" id="username" @@ -195,12 +195,22 @@ </div> <div :label="$t('settings.blocks_tab')"> + <div class="profile-edit-usersearch-wrapper"> + <Autosuggest :filter="filterUnblockedUsers" :query="queryUserIds" :placeholder="$t('settings.search_user_to_block')"> + <BlockCard slot-scope="row" :userId="row.item"/> + </Autosuggest> + </div> <block-list :refresh="true"> <template slot="empty">{{$t('settings.no_blocks')}}</template> </block-list> </div> <div :label="$t('settings.mutes_tab')"> + <div class="profile-edit-usersearch-wrapper"> + <Autosuggest :filter="filterUnMutedUsers" :query="queryUserIds" :placeholder="$t('settings.search_user_to_mute')"> + <MuteCard slot-scope="row" :userId="row.item"/> + </Autosuggest> + </div> <mute-list :refresh="true"> <template slot="empty">{{$t('settings.no_mutes')}}</template> </mute-list> @@ -262,5 +272,9 @@ text-align: right; } } + + &-usersearch-wrapper { + padding: 1em; + } } </style> |