diff options
| author | HJ <30-hj@users.noreply.git.pleroma.social> | 2019-03-25 19:09:22 +0000 |
|---|---|---|
| committer | HJ <30-hj@users.noreply.git.pleroma.social> | 2019-03-25 19:09:22 +0000 |
| commit | 3025532ecf6b728604d14af9bf218e96de0756ed (patch) | |
| tree | 6ae4a91f593357bbbcae3109002dbd22122e1d02 /src/components/mute_card | |
| parent | 8522063b2c4a35f0926517a3b75376c81131dd79 (diff) | |
| parent | 854d0e80512d2da80cd5153144698a5148da4aa6 (diff) | |
Merge branch 'develop' into 'mastoapi/public-tl'
# Conflicts:
# src/services/api/api.service.js
Diffstat (limited to 'src/components/mute_card')
| -rw-r--r-- | src/components/mute_card/mute_card.js | 2 | ||||
| -rw-r--r-- | src/components/mute_card/mute_card.vue | 16 |
2 files changed, 14 insertions, 4 deletions
diff --git a/src/components/mute_card/mute_card.js b/src/components/mute_card/mute_card.js index 5dd0a9e5..65c9cfb5 100644 --- a/src/components/mute_card/mute_card.js +++ b/src/components/mute_card/mute_card.js @@ -9,7 +9,7 @@ const MuteCard = { }, computed: { user () { - return this.$store.getters.userById(this.userId) + return this.$store.getters.findUser(this.userId) }, muted () { return this.user.muted diff --git a/src/components/mute_card/mute_card.vue b/src/components/mute_card/mute_card.vue index e1bfe20b..a4edff03 100644 --- a/src/components/mute_card/mute_card.vue +++ b/src/components/mute_card/mute_card.vue @@ -1,6 +1,6 @@ <template> <basic-user-card :user="user"> - <template slot="secondary-area"> + <div class="mute-card-content-container"> <button class="btn btn-default" @click="unmuteUser" :disabled="progress" v-if="muted"> <template v-if="progress"> {{ $t('user_card.unmute_progress') }} @@ -17,8 +17,18 @@ {{ $t('user_card.mute') }} </template> </button> - </template> + </div> </basic-user-card> </template> -<script src="./mute_card.js"></script>
\ No newline at end of file +<script src="./mute_card.js"></script> + +<style lang="scss"> +.mute-card-content-container { + margin-top: 0.5em; + text-align: right; + button { + width: 10em; + } +} +</style> |