diff options
| author | Roger Braun <roger@rogerbraun.net> | 2016-11-05 10:55:15 +0100 |
|---|---|---|
| committer | Roger Braun <roger@rogerbraun.net> | 2016-11-05 10:55:15 +0100 |
| commit | 82d023609bd20a5616c9773842cb8fb4d51dfdb7 (patch) | |
| tree | cbeb764d369f0c6461f5251feb1bbbfc88f04ec9 /src/components/status/status.vue | |
| parent | 88d960b9f6109c0c57958fb74d841dab9954ac33 (diff) | |
| parent | 572aceb7e7a86c227f2d92c0abf651ba9c3cb4df (diff) | |
Merge branch 'master' of ssh.gitgud.io:lambadalambda/pleroma-fe
Diffstat (limited to 'src/components/status/status.vue')
| -rw-r--r-- | src/components/status/status.vue | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/src/components/status/status.vue b/src/components/status/status.vue index 4d8700d5..8361aa52 100644 --- a/src/components/status/status.vue +++ b/src/components/status/status.vue @@ -2,7 +2,7 @@ <div class="status-el"> <div v-if="retweet" class="media container retweet-info"> <div class="media-left"> - <i class='fa fa-retweet'></i> + <i class='fa icon-retweet'></i> </div> <div class="media-body"> Retweeted by {{retweeter}} @@ -34,8 +34,10 @@ <div> <div class='status-actions'> - <div ng-click="toggleReplying()"> - <i class='fa icon-reply'></i> + <div> + <a href="#" v-on:click.prevent="toggleReplying"> + <i class='fa icon-reply'></i> + </a> </div> <div> <i class='fa icon-retweet'></i> @@ -43,7 +45,7 @@ <favorite-button :status=status></favorite-button> </div> - <!-- <post-status-form ng-if="replying" toggle="toggleReplying" reply-to-status="status" reply-to="{{status.id}}"></post-status-form> --> + <post-status-form v-if="replying" :reply-to="status.id" :attentions="status.attentions" :repliedUser="status.user" v-on:posted="toggleReplying"></post-status-form> </div> </div> </div> @@ -55,9 +57,14 @@ <style lang="scss"> .status-el { word-wrap: break-word; + word-break: break-word; a { word-break: break-all; } } + + .status-actions { + padding-top: 5px; + } </style> |