Troplo/pleroma-fe
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

some fixes towards how conversations appear

Browse source
This commit is contained in:
Henry Jameson 2017-11-13 01:26:43 +03:00
parent 6a44d1c9ac
commit 46765d5c1a
3 changed files with 15 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/components/conversation/conversation.vue
View file

@ -1,5 +1,5 @@
<template> <template>
<div class="timeline panel panel-default base00-background"> <div class="timeline panel panel-default">
<div class="panel-heading base01-background base04 base03-border conversation-heading"> <div class="panel-heading base01-background base04 base03-border conversation-heading">
{{ $t('timeline.conversation') }} {{ $t('timeline.conversation') }}
<span v-if="collapsable" style="float:right;"> <span v-if="collapsable" style="float:right;">

13
src/components/status/status.vue
View file

@ -129,6 +129,8 @@
word-break: break-word; word-break: break-word;
border-left-width: 0px; border-left-width: 0px;
line-height: 18px; line-height: 18px;
border-bottom: 1px solid;
border-bottom-color: inherit;
.notify { .notify {
.avatar { .avatar {
@ -280,12 +282,19 @@
.status { .status {
padding: 0.4em 0.7em 0.45em 0.7em; padding: 0.4em 0.7em 0.45em 0.7em;
border-bottom: 1px solid;
border-bottom-color: inherit;
border-left: 4px rgba(255, 48, 16, 0.65); border-left: 4px rgba(255, 48, 16, 0.65);
border-left-style: inherit; border-left-style: inherit;
} }
.status-conversation:last-child {
border-bottom: none;
}
.timeline .panel.timeline {
border-radius: 10px;
overflow: hidden;
}
.muted { .muted {
padding: 0.1em 0.4em 0.1em 0.8em; padding: 0.1em 0.4em 0.1em 0.8em;
button { button {

6
src/components/timeline/timeline.vue
View file

@ -14,7 +14,7 @@
{{$t('timeline.up_to_date')}} {{$t('timeline.up_to_date')}}
</div> </div>
</div> </div>
<div class="panel-body"> <div class="panel-body base02-background">
<div class="timeline"> <div class="timeline">
<status-or-conversation v-for="status in timeline.visibleStatuses" :key="status.id" v-bind:statusoid="status"></status-or-conversation> <status-or-conversation v-for="status in timeline.visibleStatuses" :key="status.id" v-bind:statusoid="status"></status-or-conversation>
<a href="#" v-on:click.prevent='fetchOlderStatuses()' v-if="!timeline.loading"> <a href="#" v-on:click.prevent='fetchOlderStatuses()' v-if="!timeline.loading">
@ -30,7 +30,7 @@
{{$t('user_card.followers')}} {{$t('user_card.followers')}}
</div> </div>
</div> </div>
<div class="panel-body"> <div class="panel-body base02-background">
<div class="timeline"> <div class="timeline">
<user-card v-for="follower in followers" :user="follower" :showFollows="false"></user-card> <user-card v-for="follower in followers" :user="follower" :showFollows="false"></user-card>
</div> </div>
@ -42,7 +42,7 @@
{{$t('user_card.followees')}} {{$t('user_card.followees')}}
</div> </div>
</div> </div>
<div class="panel-body"> <div class="panel-body base02-background">
<div class="timeline"> <div class="timeline">
<user-card v-for="friend in friends" :user="friend" :showFollows="true"></user-card> <user-card v-for="friend in friends" :user="friend" :showFollows="true"></user-card>
</div> </div>