diff --git a/src/components/conversation/conversation.vue b/src/components/conversation/conversation.vue index b430d875..ea222ea2 100644 --- a/src/components/conversation/conversation.vue +++ b/src/components/conversation/conversation.vue @@ -1,5 +1,5 @@ <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"> {{ $t('timeline.conversation') }} <span v-if="collapsable" style="float:right;"> diff --git a/src/components/status/status.vue b/src/components/status/status.vue index 90fb45b9..3fb3e986 100644 --- a/src/components/status/status.vue +++ b/src/components/status/status.vue @@ -129,6 +129,8 @@ word-break: break-word; border-left-width: 0px; line-height: 18px; + border-bottom: 1px solid; + border-bottom-color: inherit; .notify { .avatar { @@ -280,12 +282,19 @@ .status { 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-style: inherit; } + .status-conversation:last-child { + border-bottom: none; + } + + .timeline .panel.timeline { + border-radius: 10px; + overflow: hidden; + } + .muted { padding: 0.1em 0.4em 0.1em 0.8em; button { diff --git a/src/components/timeline/timeline.vue b/src/components/timeline/timeline.vue index 01f330c2..18e27c71 100644 --- a/src/components/timeline/timeline.vue +++ b/src/components/timeline/timeline.vue @@ -14,7 +14,7 @@ {{$t('timeline.up_to_date')}} </div> </div> - <div class="panel-body"> + <div class="panel-body base02-background"> <div class="timeline"> <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"> @@ -30,7 +30,7 @@ {{$t('user_card.followers')}} </div> </div> - <div class="panel-body"> + <div class="panel-body base02-background"> <div class="timeline"> <user-card v-for="follower in followers" :user="follower" :showFollows="false"></user-card> </div> @@ -42,7 +42,7 @@ {{$t('user_card.followees')}} </div> </div> - <div class="panel-body"> + <div class="panel-body base02-background"> <div class="timeline"> <user-card v-for="friend in friends" :user="friend" :showFollows="true"></user-card> </div>