diff --git a/src/components/VinlottisPage.vue b/src/components/VinlottisPage.vue index 1e6140f..6853636 100644 --- a/src/components/VinlottisPage.vue +++ b/src/components/VinlottisPage.vue @@ -7,20 +7,36 @@ - -> +

Trykk her for å delta

- Se vipps detaljer og QR-kode +
+ + + + + + + + + + +
+
-

| Scroll for å se annen gøy statistikk

+ +
+ +

Scroll for å se vinnere og annen gøy statistikk

+
@@ -126,21 +142,21 @@ export default { } .participate-button { - grid-column: 3 / 7; grid-row: 6 / 8; background: inherit; border: 4px solid black; padding: 0 1em 0 1em; display: flex; - width: 15em; - justify-content: space-evenly; + width: 12.5em; + column-gap: 15px; align-items: center; text-decoration: none; color: black; - i { + i { color: $link-color; + margin-left: 5px; } p { @@ -161,6 +177,65 @@ export default { text-underline-position: under; } + .icons-container { + grid-column: 7 / 12; + grid-row: 4 / 12; + width: 100%; + height: 100%; + display: grid; + grid: repeat(6, 1fr) / repeat(12, 1fr); + + i { + font-size: 5em; + + &.icon--heart-sparks{ + grid-column: 2 / 4; + grid-row: 2 / 4; + align-self: center; + justify-self: center; + + } + &.icon--face-1{ + grid-column: 4 / 7; + grid-row: 2 / 4; + justify-self: center; + + } + &.icon--face-3{ + grid-column: 7 / 10; + grid-row: 1 / 4; + align-self: center; + } + &.icon--ballon{ + grid-column: 9 / 11; + grid-row: 3 / 5; + + } + &.icon--bottle{ + grid-row: 4 / 6; + + &:nth-of-type(5) { + grid-column: 4 / 5; + align-self: center; + } + &:nth-of-type(6) { + grid-column: 5 / 6; + } + &:nth-of-type(7) { + grid-column: 6 / 7; + align-self: center; + } + &:nth-of-type(8) { + grid-column: 7 / 8; + } + &:nth-of-type(9){ + grid-column: 8 / 9; + align-self: center; + } + } + } + } + } h1 { @@ -177,24 +252,49 @@ h1 { } .container{ - display: flex; - flex-direction: column; + display: grid; + grid-template-columns: repeat(12, 1fr); + row-gap: 5em; + + .scroll-info { + display: flex; + align-items: center; + column-gap: 10px; + grid-column: 2 / -2; + } + + .chart-container { + display: flex; + width: 100%; + flex-direction: column; + grid-column: 2 / -2; + } + .total-bought { + grid-column: 2 / -2; + } + + .highscore { + grid-column: 2 / -2; + } + + .wines-container { + grid-column: 2 / -2; + } + + .icon--arrow-long-right { + rotate: 90deg; + color: $link-color; + } @include tablet { - .chart-container { - display: flex; - width: 100%; - } - display: grid; - grid-template-columns: repeat(12, 1fr); - - .scroll-info { + .scroll-info{ grid-column: 3 / -3; } .chart-container { grid-column: 3 / -3; + flex-direction: row; } .total-bought { @@ -203,7 +303,7 @@ h1 { .highscore { grid-column: 3 / -3; - align-self: baseline; + // margin-top: 5em; } .wines-container { diff --git a/src/ui/Highscore.vue b/src/ui/Highscore.vue index b767b25..378c9e4 100644 --- a/src/ui/Highscore.vue +++ b/src/ui/Highscore.vue @@ -11,8 +11,8 @@
  1. - {{index + 1}} - ic + {{index + 1}}. +

    {{ person.name }}

@@ -69,20 +69,25 @@ ol { .winner-list-container { width: 100%; - display: grid; - grid-template: 1fr / repeat(5, 1fr); - column-gap: 2em; + display: flex; + justify-content: space-evenly; + flex-wrap: wrap; + column-gap: 1em; + row-gap: 1em; margin: 0; + // align-items: baseline; .single-winner { - width: 10em; + width: 12.5em; background: $primary; padding: 1em; display: grid; grid-template: 1fr .3fr / 1fr 1fr 1fr; - justify-content: center; align-items: center; - justify-items: center; + + i { + font-size: 3em; + } .placement { grid-row: 1;