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

Fix color inputs to wrap on mobile, fix timeline background color to not clash with panel headings.

Browse source
This commit is contained in:
shpuld 2017-11-18 17:41:43 +02:00
parent 3534a9a62f
commit a7500410ff
2 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/components/style_switcher/style_switcher.vue
View file

@ -49,16 +49,17 @@
.color-container { .color-container {
display: flex; display: flex;
flex-wrap: wrap;
} }
.color-item { .color-item {
max-width: 7em; max-width: 9em;
display:flex; display:flex;
flex-wrap:wrap; flex-wrap:wrap;
} }
.theme-color-in { .theme-color-in {
max-width: 6em; max-width: 8em;
border-radius: 2px; border-radius: 2px;
border: 0; border: 0;
padding: 5px; padding: 5px;

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 base02-background"> <div class="panel-body base01-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 base02-background"> <div class="panel-body base01-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 base02-background"> <div class="panel-body base01-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>