Merge branch 'scrolltotop' into shigusegubu-vue3

* scrolltotop:
  fix chevrons alignment
  fix alert dot
  move definitions for timeline header buttons to Panel.scss, now called rightside buttons
  Update dependency @vuelidate/validators to v2.0.0
  Remove lolex package
  Remove diff package
  Pin dependencies
  Update dependency sass to v1.55.0
This commit is contained in:
Henry Jameson 2022-10-09 19:11:12 +03:00
commit 085da87af3
10 changed files with 70 additions and 93 deletions

View file

@ -20,10 +20,12 @@
<QuickFilterSettings
v-if="!collapsable"
:conversation="true"
class="rightside-button"
/>
<QuickViewSettings
v-if="!collapsable"
:conversation="true"
class="rightside-button"
/>
</div>
<div class="conversation-body panel-body">

View file

@ -12,7 +12,7 @@
@click="toggleCollapse"
>
<FAIcon
class="timelines-chevron"
class="navigation-chevron"
fixed-width
:icon="collapsed ? 'chevron-down' : 'chevron-up'"
/>
@ -143,12 +143,17 @@
border: none;
}
.timelines-chevron {
.navigation-chevron {
margin-left: 0.8em;
margin-right: 0.8em;
font-size: 1.1em;
}
.timelines-chevron {
margin-left: 0.8em;
font-size: 1.1em;
}
.timelines-background {
padding: 0 0 0 0.6em;
background-color: $fallback--lightBg;

View file

@ -39,10 +39,8 @@
height: 0.5em;
width: 0.5em;
position: absolute;
right: calc(50% - 0.25em);
top: calc(50% - 0.25em);
margin-left: 6px;
margin-top: -6px;
right: calc(50% - 0.75em);
top: calc(50% - 0.5em);
background-color: $fallback--cRed;
background-color: var(--badgeNotification, $fallback--cRed);
}

View file

@ -29,27 +29,6 @@
}
}
}
.timeline-header-button {
align-self: stretch;
text-align: center;
width: var(--__panel-heading-height);
height: var(--__panel-heading-height);
margin: calc(-1 * var(--panel-heading-height-padding)) 0;
margin-right: calc(-1 * var(--__panel-heading-gap));
> button {
box-sizing: border-box;
padding: calc(1 * var(--panel-heading-height-padding)) 0;
height: 100%;
width: 100%;
text-align: center;
svg {
font-size: 1.2em;
}
}
}
}
.notification {

View file

@ -21,7 +21,7 @@
>{{ unseenCount }}</span>
</div>
<div
class="timeline-header-button"
class="rightside-button"
v-if="showScrollTop"
>
<button
@ -46,7 +46,7 @@
>
{{ $t('notifications.read') }}
</button>
<NotificationFilters class="timeline-header-button" />
<NotificationFilters class="rightside-button" />
</div>
<div class="panel-body">
<div

View file

@ -13,38 +13,6 @@
background-color: var(--cGreen);
}
.timeline-header-button {
align-self: stretch;
text-align: center;
width: var(--__panel-heading-height);
height: var(--__panel-heading-height);
margin: calc(-1 * var(--panel-heading-height-padding)) 0;
margin-right: calc(-1 * var(--__panel-heading-gap));
> button {
box-sizing: border-box;
padding: calc(1 * var(--panel-heading-height-padding)) 0;
height: 100%;
width: 100%;
text-align: center;
svg {
font-size: 1.2em;
}
}
}
.timeline-header-icon {
align-self: stretch;
text-align: center;
width: var(--__panel-heading-height);
margin-right: calc(-1 * var(--__panel-heading-gap));
svg {
font-size: 1.2em;
}
}
.loadmore-button {
position: relative
}

View file

@ -6,7 +6,7 @@
:timeline-name="timelineName"
/>
<div
class="timeline-header-button"
class="rightside-button"
v-if="showScrollTop && !embedded"
>
<button
@ -25,7 +25,7 @@
</div>
<template v-if="mobileLayout && !embedded">
<div
class="timeline-header-button"
class="rightside-button"
v-if="showLoadButton"
>
<button
@ -41,7 +41,7 @@
</div>
<div
v-else-if="!embedded"
class="loadmore-text faint veryfaint timeline-header-icon"
class="loadmore-text faint veryfaint rightside-icon"
@click.prevent
>
<FAIcon
@ -66,8 +66,8 @@
{{ $t('timeline.up_to_date') }}
</div>
</template>
<QuickFilterSettings v-if="!embedded" class="timeline-header-button"/>
<QuickViewSettings v-if="!embedded" class="timeline-header-button"/>
<QuickFilterSettings v-if="!embedded" class="rightside-button"/>
<QuickViewSettings v-if="!embedded" class="rightside-button"/>
</div>
<div :class="classes.body">
<div

View file

@ -196,6 +196,38 @@
}
}
}
.rightside-button {
align-self: stretch;
text-align: center;
width: var(--__panel-heading-height);
height: var(--__panel-heading-height);
margin: calc(-1 * var(--panel-heading-height-padding)) 0;
margin-right: calc(-1 * var(--__panel-heading-gap));
> button {
box-sizing: border-box;
padding: calc(1 * var(--panel-heading-height-padding)) 0;
height: 100%;
width: 100%;
text-align: center;
svg {
font-size: 1.2em;
}
}
}
.rightside-icon {
align-self: stretch;
text-align: center;
width: var(--__panel-heading-height);
margin-right: calc(-1 * var(--__panel-heading-gap));
svg {
font-size: 1.2em;
}
}
}
.panel-footer {