Merge branch 'scrolltotop' into shigusegubu-vue3

* scrolltotop:
  use new color slot for badges
  add titles to mobile buttons
This commit is contained in:
Henry Jameson 2022-10-17 21:51:47 +03:00
commit 82f47c0585
5 changed files with 14 additions and 1 deletions

View file

@ -27,6 +27,7 @@
<button <button
class="button-unstyled scroll-to-top-button" class="button-unstyled scroll-to-top-button"
type="button" type="button"
:title="$t('general.scroll_to_top')"
@click="scrollToTop" @click="scrollToTop"
> >
<FALayers class="fa-scale-110 fa-old-padding-layer"> <FALayers class="fa-scale-110 fa-old-padding-layer">

View file

@ -10,7 +10,7 @@
top: calc(50% - 4px); top: calc(50% - 4px);
margin-left: 6px; margin-left: 6px;
margin-top: -6px; margin-top: -6px;
background-color: var(--cGreen); background-color: var(--badgeNeutral);
} }
.loadmore-button { .loadmore-button {

View file

@ -12,6 +12,7 @@
<button <button
class="button-unstyled scroll-to-top-button" class="button-unstyled scroll-to-top-button"
type="button" type="button"
:title="$t('general.scroll_to_top')"
@click="scrollToTop" @click="scrollToTop"
> >
<FALayers class="fa-scale-110 fa-old-padding-layer"> <FALayers class="fa-scale-110 fa-old-padding-layer">
@ -30,6 +31,7 @@
> >
<button <button
class="button-unstyled loadmore-button" class="button-unstyled loadmore-button"
:title="loadButtonString"
@click.prevent="showNewStatuses" @click.prevent="showNewStatuses"
> >
<FAIcon <FAIcon
@ -42,6 +44,7 @@
<div <div
v-else-if="!embedded" v-else-if="!embedded"
class="loadmore-text faint veryfaint rightside-icon" class="loadmore-text faint veryfaint rightside-icon"
:title="$t('timeline.up_to_date')"
@click.prevent @click.prevent
> >
<FAIcon <FAIcon

View file

@ -84,6 +84,7 @@
"yes": "Yes", "yes": "Yes",
"no": "No", "no": "No",
"peek": "Peek", "peek": "Peek",
"scroll_to_top": "Scroll to top",
"role": { "role": {
"admin": "Admin", "admin": "Admin",
"moderator": "Moderator" "moderator": "Moderator"

View file

@ -709,6 +709,14 @@ export const SLOT_INHERITANCE = {
textColor: 'bw' textColor: 'bw'
}, },
badgeNeutral: '--cGreen',
badgeNeutralText: {
depends: ['text', 'badgeNeutral'],
layer: 'badge',
variant: 'badgeNeutral',
textColor: 'bw'
},
chatBg: { chatBg: {
depends: ['bg'] depends: ['bg']
}, },