diff options
| author | lambadalambda <gitgud@rogerbraun.net> | 2017-03-10 01:44:13 -0500 |
|---|---|---|
| committer | lambadalambda <gitgud@rogerbraun.net> | 2017-03-10 01:44:13 -0500 |
| commit | 380adc696649df6974076ba5a68ce8b649af3bc7 (patch) | |
| tree | 11d5891f8142958e9e095f338f2dcb97c4a12422 | |
| parent | 2f0fcd14c948870ede42503010fc7f7617eb02f1 (diff) | |
| parent | 3bb5f86d0d804881bbe9b7b1e16d8eb551e5f2b3 (diff) | |
Merge branch 'feature/separate-reply-form-from-inside-status' into 'develop'
Make reply window not part of the inner status.
See merge request !60
| -rw-r--r-- | src/components/status/status.vue | 22 |
1 files changed, 19 insertions, 3 deletions
diff --git a/src/components/status/status.vue b/src/components/status/status.vue index 9b0827a7..c180262e 100644 --- a/src/components/status/status.vue +++ b/src/components/status/status.vue @@ -73,18 +73,20 @@ <div class='status-actions'> <div> <a href="#" v-on:click.prevent="toggleReplying"> - <i class='fa icon-reply'></i> + <i class="fa 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> - - <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> + <div class="status base00-background container" v-if="replying"> + <div class="reply-left"/> + <post-status-form class="reply-body" :reply-to="status.id" :attentions="status.attentions" :repliedUser="status.user" v-on:posted="toggleReplying"/> + </div> </template> </div> </template> @@ -141,6 +143,10 @@ color: $blue; } + .icon-reply-active { + color: $blue; + } + .status .avatar { width: 48px; } @@ -172,4 +178,14 @@ margin-bottom: 1em; margin-top: 0.2em; } + + .reply-left { + flex: 0; + min-width: 48px; + } + + .reply-body { + flex: 1; + } + </style> |