diff options
| author | HJ <30-hj@users.noreply.git.pleroma.social> | 2021-04-07 17:40:07 +0000 |
|---|---|---|
| committer | HJ <30-hj@users.noreply.git.pleroma.social> | 2021-04-07 17:40:07 +0000 |
| commit | 8b96ea93776fd1eb462a7c54822d4f8ad6a9e776 (patch) | |
| tree | 002a88cdb6e25ea3177b712bc3cdc05a085f19e5 /src/components/timeline/timeline.vue | |
| parent | 4e3c4ec1dbbf88b09a84a80519f4ccced5a4dc2c (diff) | |
| parent | 5c064ccf553ffcd3286ad1b3305633c5c4c4c0c4 (diff) | |
Merge branch 'settings-import-export' into 'develop'
Settings backup/restore + small fixes
See merge request pleroma/pleroma-fe!1372
Diffstat (limited to 'src/components/timeline/timeline.vue')
| -rw-r--r-- | src/components/timeline/timeline.vue | 38 |
1 files changed, 5 insertions, 33 deletions
diff --git a/src/components/timeline/timeline.vue b/src/components/timeline/timeline.vue index 286477c2..767428f0 100644 --- a/src/components/timeline/timeline.vue +++ b/src/components/timeline/timeline.vue @@ -52,13 +52,13 @@ <div :class="classes.footer"> <div v-if="count===0" - class="new-status-notification text-center panel-footer faint" + class="new-status-notification text-center faint" > {{ $t('timeline.no_statuses') }} </div> <div v-else-if="bottomedOut" - class="new-status-notification text-center panel-footer faint" + class="new-status-notification text-center faint" > {{ $t('timeline.no_more_statuses') }} </div> @@ -67,13 +67,13 @@ class="button-unstyled -link -fullwidth" @click.prevent="fetchOlderStatuses()" > - <div class="new-status-notification text-center panel-footer"> + <div class="new-status-notification text-center"> {{ $t('timeline.load_older') }} </div> </button> <div v-else - class="new-status-notification text-center panel-footer" + class="new-status-notification text-center" > <FAIcon icon="circle-notch" @@ -87,32 +87,4 @@ <script src="./timeline.js"></script> -<style lang="scss"> -@import '../../_variables.scss'; - -.Timeline { - .loadmore-text { - opacity: 1; - } - - &.-blocked { - cursor: progress; - } -} - -.timeline-heading { - max-width: 100%; - flex-wrap: nowrap; - align-items: center; - position: relative; - - .loadmore-button { - flex-shrink: 0; - } - - .loadmore-text { - flex-shrink: 0; - line-height: 1em; - } -} -</style> +<style src="./timeline.scss" lang="scss"> </style> |