Merge branch 'scrolltotop' into shigusegubu-vue3
* scrolltotop: use new color slot for badges add titles to mobile buttons
This commit is contained in:
commit
82f47c0585
5 changed files with 14 additions and 1 deletions
|
@ -27,6 +27,7 @@
|
|||
<button
|
||||
class="button-unstyled scroll-to-top-button"
|
||||
type="button"
|
||||
:title="$t('general.scroll_to_top')"
|
||||
@click="scrollToTop"
|
||||
>
|
||||
<FALayers class="fa-scale-110 fa-old-padding-layer">
|
||||
|
|
|
@ -10,7 +10,7 @@
|
|||
top: calc(50% - 4px);
|
||||
margin-left: 6px;
|
||||
margin-top: -6px;
|
||||
background-color: var(--cGreen);
|
||||
background-color: var(--badgeNeutral);
|
||||
}
|
||||
|
||||
.loadmore-button {
|
||||
|
|
|
@ -12,6 +12,7 @@
|
|||
<button
|
||||
class="button-unstyled scroll-to-top-button"
|
||||
type="button"
|
||||
:title="$t('general.scroll_to_top')"
|
||||
@click="scrollToTop"
|
||||
>
|
||||
<FALayers class="fa-scale-110 fa-old-padding-layer">
|
||||
|
@ -30,6 +31,7 @@
|
|||
>
|
||||
<button
|
||||
class="button-unstyled loadmore-button"
|
||||
:title="loadButtonString"
|
||||
@click.prevent="showNewStatuses"
|
||||
>
|
||||
<FAIcon
|
||||
|
@ -42,6 +44,7 @@
|
|||
<div
|
||||
v-else-if="!embedded"
|
||||
class="loadmore-text faint veryfaint rightside-icon"
|
||||
:title="$t('timeline.up_to_date')"
|
||||
@click.prevent
|
||||
>
|
||||
<FAIcon
|
||||
|
|
|
@ -84,6 +84,7 @@
|
|||
"yes": "Yes",
|
||||
"no": "No",
|
||||
"peek": "Peek",
|
||||
"scroll_to_top": "Scroll to top",
|
||||
"role": {
|
||||
"admin": "Admin",
|
||||
"moderator": "Moderator"
|
||||
|
|
|
@ -709,6 +709,14 @@ export const SLOT_INHERITANCE = {
|
|||
textColor: 'bw'
|
||||
},
|
||||
|
||||
badgeNeutral: '--cGreen',
|
||||
badgeNeutralText: {
|
||||
depends: ['text', 'badgeNeutral'],
|
||||
layer: 'badge',
|
||||
variant: 'badgeNeutral',
|
||||
textColor: 'bw'
|
||||
},
|
||||
|
||||
chatBg: {
|
||||
depends: ['bg']
|
||||
},
|
||||
|
|
Loading…
Add table
Reference in a new issue