Troplo/pleroma-fe
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

ui improvements

Browse source
This commit is contained in:
taehoon 2019-04-04 16:20:48 -04:00
parent c81bde0c1d
commit 7f6bd538f3
2 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/components/selectable_list/selectable_list.vue
View file

@ -2,7 +2,7 @@
<div class="selectable-list"> <div class="selectable-list">
<div class="selectable-list-header" v-if="items.length > 0"> <div class="selectable-list-header" v-if="items.length > 0">
<div class="selectable-list-checkbox-wrapper"> <div class="selectable-list-checkbox-wrapper">
<Checkbox :checked="allSelected" @change="toggleAll" /> <Checkbox :checked="allSelected" @change="toggleAll">Select All</Checkbox>
</div> </div>
<div class="selectable-list-header-actions"> <div class="selectable-list-header-actions">
<slot name="header" :selected="selected" /> <slot name="header" :selected="selected" />

14
src/components/user_settings/user_settings.vue
View file

@ -200,9 +200,9 @@
<BlockCard slot-scope="row" :userId="row.item"/> <BlockCard slot-scope="row" :userId="row.item"/>
</Autosuggest> </Autosuggest>
</div> </div>
<BlockList :refresh="true" :getKey="item => item"> <BlockList :refresh="true" :getKey="item => item" class="profile-edit-user-list">
<template slot="header" slot-scope="p"> <template slot="header" slot-scope="p">
<div class="bulk-actions-wrapper"> <div class="profile-edit-bulk-actions">
<ProgressButton class="btn btn-default" v-if="p.selected.length > 0" :click="() => blockUsers(p.selected)"> <ProgressButton class="btn btn-default" v-if="p.selected.length > 0" :click="() => blockUsers(p.selected)">
{{ $t('user_card.block') }} {{ $t('user_card.block') }}
<template slot="progress">{{ $t('user_card.block_progress') }}</template> <template slot="progress">{{ $t('user_card.block_progress') }}</template>
@ -224,9 +224,9 @@
<MuteCard slot-scope="row" :userId="row.item"/> <MuteCard slot-scope="row" :userId="row.item"/>
</Autosuggest> </Autosuggest>
</div> </div>
<MuteList :refresh="true" :getKey="item => item"> <MuteList :refresh="true" :getKey="item => item" class="profile-edit-user-list">
<template slot="header" slot-scope="p"> <template slot="header" slot-scope="p">
<div class="bulk-actions-wrapper"> <div class="profile-edit-bulk-actions">
<ProgressButton class="btn btn-default" v-if="p.selected.length > 0" :click="() => muteUsers(p.selected)"> <ProgressButton class="btn btn-default" v-if="p.selected.length > 0" :click="() => muteUsers(p.selected)">
{{ $t('user_card.mute') }} {{ $t('user_card.mute') }}
<template slot="progress">{{ $t('user_card.mute_progress') }}</template> <template slot="progress">{{ $t('user_card.mute_progress') }}</template>
@ -303,7 +303,11 @@
padding: 1em; padding: 1em;
} }
.bulk-actions-wrapper { &-user-list {
margin-top: 1.5em;
}
&-bulk-actions {
text-align: right; text-align: right;
padding: 0 1em; padding: 0 1em;
min-height: 28px; min-height: 28px;