diff options
| author | Hakaba Hitoyo <example@example.com> | 2018-02-04 08:36:10 +0900 |
|---|---|---|
| committer | Hakaba Hitoyo <example@example.com> | 2018-02-04 08:36:10 +0900 |
| commit | 013f11497fbc955bea6c182d64b512de2ee3bcdf (patch) | |
| tree | 6979bab5ddc02f68992cf8e71b4612e3f2b02d12 /src/components/status/status.vue | |
| parent | 95cba854f389ebdee200d0df147e4c26ed4949a0 (diff) | |
| parent | d97e6777ba849c9802da1e566d2baa2e1d7bdf70 (diff) | |
slove-conflict
Diffstat (limited to 'src/components/status/status.vue')
| -rw-r--r-- | src/components/status/status.vue | 23 |
1 files changed, 11 insertions, 12 deletions
diff --git a/src/components/status/status.vue b/src/components/status/status.vue index d6c8cdb3..f6afaa25 100644 --- a/src/components/status/status.vue +++ b/src/components/status/status.vue @@ -8,8 +8,8 @@ <i class="base09 icon-reply" :class="{'icon-reply-active': replying}"></i> </a> </div> - <retweet-button :status=status></retweet-button> - <favorite-button :status=status></favorite-button> + <retweet-button :loggedIn="loggedIn" :status=status></retweet-button> + <favorite-button :loggedIn="loggedIn" :status=status></favorite-button> </div> </div> <post-status-form class="reply-body" :reply-to="status.id" :attentions="status.attentions" :repliedUser="status.user" v-on:posted="toggleReplying" v-if="replying"/> @@ -105,17 +105,15 @@ </div> </div> - <div v-if="loggedIn"> - <div class='status-actions'> - <div> - <a href="#" v-on:click.prevent="toggleReplying"> - <i class="base09 icon-reply" :class="{'icon-reply-active': replying}"></i> - </a> - </div> - <retweet-button :status=status></retweet-button> - <favorite-button :status=status></favorite-button> - <delete-button :status=status></delete-button> + <div class='status-actions'> + <div v-if="loggedIn"> + <a href="#" v-on:click.prevent="toggleReplying"> + <i class="base09 icon-reply" :class="{'icon-reply-active': replying}"></i> + </a> </div> + <retweet-button :loggedIn="loggedIn" :status=status></retweet-button> + <favorite-button :loggedIn="loggedIn" :status=status></favorite-button> + <delete-button :status=status></delete-button> </div> </div> </div> @@ -248,6 +246,7 @@ img, video { max-width: 100%; max-height: 400px; + vertical-align: middle; object-fit: contain; } |