footer margin
This commit is contained in:
parent
738be6e667
commit
daa87c0255
2 changed files with 27 additions and 17 deletions
|
@ -4,7 +4,7 @@
|
|||
<TitleBar />
|
||||
<Dashboard>
|
||||
<template slot="message">
|
||||
<div class="d-flex flex-column fill-height pb-sm-12">
|
||||
<div class="d-flex flex-column fill-height">
|
||||
<Message :html="message_html" />
|
||||
<ImageCarousel
|
||||
class="mt-auto"
|
||||
|
@ -19,7 +19,6 @@
|
|||
<template slot="calendars">
|
||||
<CalendarCarousel :speed="calendar_speed" :data="calendar_data" />
|
||||
<DashboardInfo
|
||||
class="pb-12 pb-sm-0"
|
||||
:server_host="server_host"
|
||||
:server_name="server_name"
|
||||
:version="dashboard_version"
|
||||
|
|
|
@ -1,9 +1,12 @@
|
|||
<template>
|
||||
<div>
|
||||
<v-footer :color="color" :dark="is_dark" fixed>
|
||||
<span ref="marquee" class="text-h6">
|
||||
<div ref="content" v-html="content" />
|
||||
</span>
|
||||
<span ref="marquee" class="text-h6" v-html="content" />
|
||||
</v-footer>
|
||||
<v-footer>
|
||||
<span class="text-h6" v-html="content" />
|
||||
</v-footer>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script lang="ts">
|
||||
|
@ -43,9 +46,12 @@ export default class TickerBar extends Vue {
|
|||
@Watch("content", { immediate: true })
|
||||
private set_marquee_duration(): void {
|
||||
this.$nextTick((): void => {
|
||||
const width = parseFloat(
|
||||
window.getComputedStyle(this._content).getPropertyValue("width")
|
||||
);
|
||||
const style = window.getComputedStyle(this._marquee);
|
||||
|
||||
const width =
|
||||
parseFloat(style.getPropertyValue("width")) -
|
||||
parseFloat(style.getPropertyValue("padding-left")) -
|
||||
parseFloat(style.getPropertyValue("padding-right"));
|
||||
|
||||
// 10 seconds + another second per 40px
|
||||
const duration = 10 + Math.round(width / 40);
|
||||
|
@ -69,6 +75,10 @@ export default class TickerBar extends Vue {
|
|||
.v-footer {
|
||||
white-space: nowrap;
|
||||
overflow: hidden;
|
||||
z-index: 0;
|
||||
|
||||
&:first-child {
|
||||
z-index: 999;
|
||||
|
||||
> span {
|
||||
display: inline-block;
|
||||
|
@ -80,6 +90,7 @@ export default class TickerBar extends Vue {
|
|||
animation-play-state: paused;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
:deep() * {
|
||||
margin: 0 !important;
|
||||
|
|
Loading…
Reference in a new issue