Merge branch 'scrolltotop' into shigusegubu-vue3

* scrolltotop:
  lint
  show counter in show new button on mobile
This commit is contained in:
Henry Jameson 2022-11-01 23:26:03 +02:00
commit 463956cd3c
3 changed files with 26 additions and 2 deletions

View file

@ -69,6 +69,13 @@ const Timeline = {
return `${this.$t('timeline.show_new')} (${this.newStatusCount})`
}
},
mobileLoadButtonString () {
if (this.timeline.flushMarker !== 0) {
return '+'
} else {
return this.newStatusCount > 99 ? '∞' : this.newStatusCount
}
},
classes () {
let rootClasses = !this.embedded ? ['panel', 'panel-default'] : ['-nonpanel']
if (this.blockingClicks) rootClasses = rootClasses.concat(['-blocked', '_misclick-prevention'])

View file

@ -13,8 +13,23 @@
background-color: var(--badgeNeutral);
}
.alert-badge {
font-size: 0.75em;
line-height: 1;
text-align: right;
border-radius: var(--tooltipRadius);
position: absolute;
left: calc(50% - 0.5em);
top: calc(50% - 0.4em);
padding: 0.2em;
margin-left: 0.7em;
margin-top: -1em;
background-color: var(--badgeNeutral);
color: var(--badgeNeutralText);
}
.loadmore-button {
position: relative
position: relative;
}
&.-blocked {

View file

@ -38,7 +38,9 @@
fixed-width
icon="circle-plus"
/>
<div class="alert-dot" />
<div class="alert-badge">
{{ mobileLoadButtonString }}
</div>
</button>
</div>
<div