Pulled feature branch up-to-date w/ master.

This commit is contained in:
2020-11-20 19:15:46 +01:00
32 changed files with 1511 additions and 1985 deletions

View File

@@ -2,6 +2,7 @@
<div class="app-container">
<banner :routes="routes"/>
<router-view />
<Footer />
<UpdateToast
v-if="showToast"
:text="toastText"
@@ -14,11 +15,12 @@
<script>
import ServiceWorkerMixin from "@/mixins/ServiceWorkerMixin";
import banner from "@/ui/Banner";
import Footer from "@/ui/Footer";
import UpdateToast from "@/ui/UpdateToast";
export default {
name: "vinlottis",
components: { banner, UpdateToast },
components: { banner, UpdateToast, Footer },
props: {},
data() {
return {
@@ -77,8 +79,10 @@ export default {
</script>
<style lang="scss">
@import "./styles/global.scss";
@import "./styles/positioning.scss";
@import "styles/global.scss";
@import "styles/positioning.scss";
@import "styles/vinlottis-icons";
@font-face {
font-family: "knowit";
font-weight: 600;
@@ -100,9 +104,16 @@ body {
}
</style>
<style scoped>
<style lang="scss" scoped>
.app-container {
background-color: white;
min-height: 100vh;
display: grid;
grid-template-rows: 80px auto 100px;
.main-container{
height: 100%;
width: 100%;
}
}
</style>