logo

pleroma-fe

My custom branche(s) on git.pleroma.social/pleroma/pleroma-fe
commit: 2f7e5c8770719595f3a7c2a2fd5f7ba5f15914d4
parent: e0a108fcaba7d59e74795445299169b1ff9ee6cc
Author: Roger Braun <roger@rogerbraun.net>
Date:   Mon, 28 Nov 2016 16:10:03 +0100

Always show action buttons below user content.

Diffstat:

Msrc/components/status/status.vue46++++++++++++++++++++++++++--------------------
1 file changed, 26 insertions(+), 20 deletions(-)

diff --git a/src/components/status/status.vue b/src/components/status/status.vue @@ -15,26 +15,28 @@ </a> </div> <div class="media-body"> - <h4 class="media-heading"> - {{status.user.name}} - <small><a :href="status.user.statusnet_profile_url">{{status.user.screen_name}}</a></small> - <small v-if="status.in_reply_to_screen_name"> &gt; <a :href="status.in_reply_to_profileurl">{{status.in_reply_to_screen_name}}</a></small> - - - <small> - <router-link :to="{ name: 'conversation', params: { id: status.id } }"> - {{status.created_at_parsed}} - </router-link> - </small> - <small v-if="!status.is_local" class="source_url"> - <a :href="status.external_url" target="_blank" >Source</a> - </small> - </h4> - - <div class="status-content" v-html="status.statusnet_html"></div> - - <div v-if='status.attachments' class='attachments'> - <attachment :status-id="status.id" :nsfw="status.nsfw" :attachment="attachment" v-for="attachment in status.attachments"> - </attachment> + <div class="user-content"> + <h4 class="media-heading"> + {{status.user.name}} + <small><a :href="status.user.statusnet_profile_url">{{status.user.screen_name}}</a></small> + <small v-if="status.in_reply_to_screen_name"> &gt; <a :href="status.in_reply_to_profileurl">{{status.in_reply_to_screen_name}}</a></small> + - + <small> + <router-link :to="{ name: 'conversation', params: { id: status.id } }"> + {{status.created_at_parsed}} + </router-link> + </small> + <small v-if="!status.is_local" class="source_url"> + <a :href="status.external_url" target="_blank" >Source</a> + </small> + </h4> + + <div class="status-content" v-html="status.statusnet_html"></div> + + <div v-if='status.attachments' class='attachments'> + <attachment :status-id="status.id" :nsfw="status.nsfw" :attachment="attachment" v-for="attachment in status.attachments"> + </attachment> + </div> </div> <div v-if="loggedIn"> @@ -65,6 +67,10 @@ word-wrap: break-word; word-break: break-word; + .user-content { + min-height: 52px; + } + .source_url { float: right; }