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

Kinda went back to using align-items: stretch. Fixed error message floating.

Browse source
This commit is contained in:
Henry Jameson 2018-09-03 22:12:18 +03:00
parent 20b0ffc0b9
commit a6047e0ad5
3 changed files with 23 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
src/App.scss
View file

@ -325,18 +325,35 @@ main-router {
background-size: cover; background-size: cover;
padding: .6em .6em; padding: .6em .6em;
text-align: left; text-align: left;
font-size: 1.3em; line-height: 28px;
line-height: 24px;
background-color: $fallback--btn; background-color: $fallback--btn;
background-color: var(--btn, $fallback--btn); background-color: var(--btn, $fallback--btn);
align-items: baseline; align-items: baseline;
.title { .title {
flex: 1 0 auto; flex: 1 0 auto;
font-size: 1.3em;
}
.alert {
white-space: nowrap;
text-overflow: ellipsis;
overflow-x: hidden;
} }
button { button {
height: 100%; flex-shrink: 0;
}
button, .alert {
// height: 100%;
line-height: 21px;
min-height: 0;
box-sizing: border-box;
margin: 0;
margin-left: .25em;
min-width: 1px;
align-self: stretch;
} }
} }

4
src/components/notifications/notifications.scss
View file

@ -22,10 +22,6 @@
} }
.loadmore-error { .loadmore-error {
min-width: 6em;
text-align: center;
padding: 0 0.25em 0 0.25em;
margin: 0;
color: $fallback--fg; color: $fallback--fg;
color: var(--fg, $fallback--fg); color: var(--fg, $fallback--fg);
} }

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

@ -4,12 +4,12 @@
<div class="title"> <div class="title">
{{title}} {{title}}
</div> </div>
<button @click.prevent="showNewStatuses" class="loadmore-button" v-if="timeline.newStatusCount > 0 && !timelineError">
{{$t('timeline.show_new')}}{{newStatusCountStr}}
</button>
<div @click.prevent class="loadmore-error alert error" v-if="timelineError"> <div @click.prevent class="loadmore-error alert error" v-if="timelineError">
{{$t('timeline.error_fetching')}} {{$t('timeline.error_fetching')}}
</div> </div>
<button @click.prevent="showNewStatuses" class="loadmore-button" v-if="timeline.newStatusCount > 0 && !timelineError">
{{$t('timeline.show_new')}}{{newStatusCountStr}}
</button>
<div @click.prevent class="loadmore-text" v-if="!timeline.newStatusCount > 0 && !timelineError"> <div @click.prevent class="loadmore-text" v-if="!timeline.newStatusCount > 0 && !timelineError">
{{$t('timeline.up_to_date')}} {{$t('timeline.up_to_date')}}
</div> </div>
@ -58,7 +58,6 @@
.timeline { .timeline {
.loadmore-text { .loadmore-text {
font-size: 14px;
opacity: 0.8; opacity: 0.8;
background-color: transparent; background-color: transparent;
color: $fallback--faint; color: $fallback--faint;
@ -66,11 +65,6 @@
} }
.loadmore-error { .loadmore-error {
font-size: 14px;
min-width: 6em;
text-align: center;
padding: 0 0.25em 0 0.25em;
margin: 0;
color: $fallback--fg; color: $fallback--fg;
color: var(--fg, $fallback--fg); color: var(--fg, $fallback--fg);
} }