diff options
| author | HJ <spam@hjkos.com> | 2018-12-11 20:35:19 +0000 |
|---|---|---|
| committer | HJ <spam@hjkos.com> | 2018-12-11 20:35:19 +0000 |
| commit | a8acba8cb2c639a3de3764df4226960458f996b8 (patch) | |
| tree | 50c4d353576cc419eeea4f45c4497309222cf360 /src/components/timeline/timeline.vue | |
| parent | fb5261b926adfb5b9bbe1bf55e36fe8b5f4eb57f (diff) | |
| parent | 8fcc4c67667b0951d6c0d28cec320bd4b2f8f107 (diff) | |
Merge branch 'feature/theming2' into 'develop'
Themes v2
See merge request pleroma/pleroma-fe!377
Diffstat (limited to 'src/components/timeline/timeline.vue')
| -rw-r--r-- | src/components/timeline/timeline.vue | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/src/components/timeline/timeline.vue b/src/components/timeline/timeline.vue index 2dd4376a..bc7f74c2 100644 --- a/src/components/timeline/timeline.vue +++ b/src/components/timeline/timeline.vue @@ -10,7 +10,7 @@ <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 faint" v-if="!timeline.newStatusCount > 0 && !timelineError"> {{$t('timeline.up_to_date')}} </div> </div> @@ -58,15 +58,7 @@ .timeline { .loadmore-text { - opacity: 0.8; - background-color: transparent; - color: $fallback--faint; - color: var(--faint, $fallback--faint); - } - - .loadmore-error { - color: $fallback--fg; - color: var(--fg, $fallback--fg); + opacity: 1; } } @@ -79,7 +71,7 @@ border-color: var(--border, $fallback--border); padding: 10px; z-index: 1; - background-color: $fallback--btn; - background-color: var(--btn, $fallback--btn); + background-color: $fallback--fg; + background-color: var(--panel, $fallback--fg); } </style> |