Skip to content

Commit f33e8d4

Browse files
authored
Fix/hotfixes (#27)
* added live-vote visuals * made signUp container on profile fit * changed capacity to 50 for workshops * made nav turn to burger sooner
1 parent f7612da commit f33e8d4

File tree

6 files changed

+30
-7
lines changed

6 files changed

+30
-7
lines changed
62 KB
Loading
38.6 KB
Loading

backend/app/graphql/helpers/event-status.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ export const getParticipantCapacityFor =
7272
(eventType: EventType) => {
7373
switch (eventType) {
7474
case EventType.workshop:
75-
return 30;
75+
return 50;
7676
case EventType.talk:
7777
case EventType.panel:
7878
return 50;

components/nav/AppHeader.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
<div
4040
:class="$style.layoutTopbarRight"
4141
>
42-
<ul class="hidden lg:flex">
42+
<ul class="hidden xl:flex">
4343
<li
4444
v-for="page in pages"
4545
:key="`top-${page.name}`"
@@ -77,7 +77,7 @@
7777
</ul>
7878
<p-button
7979
:class="$style.sidebarBtn"
80-
class="lg:hidden p-button-text"
80+
class="xl:hidden p-button-text"
8181
type="button"
8282
@click="sidebarOpen = true"
8383
>

pages/live-vote/[season]/view-live-vote-results.vue

Lines changed: 24 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
<div class="relative">
33
<div
44
:class="$style.container"
5+
class="relative"
56
:style="{
67
'grid-template-columns': `repeat(${totalVotes}, minmax(0, 1fr))`,
78
}"
@@ -16,6 +17,21 @@
1617
}"
1718
v-text="`${Math.round(option.voteCount / totalVotes * 100)}%`"
1819
/>
20+
21+
<div class="absolute" style="height: 50%; width: 50%; top: 0;">
22+
<app-img
23+
:src="VisualLeft"
24+
alt="Contact"
25+
contain
26+
/>
27+
</div>
28+
<div class="absolute" style="height: 35%; width: 25%; bottom: 0; right: 0;">
29+
<app-img
30+
:src="VisualRight"
31+
alt="Contact"
32+
contain
33+
/>
34+
</div>
1935
</div>
2036
<div :class="$style.qrContainer">
2137
<div>
@@ -36,6 +52,9 @@
3652
useSeasonsStore,
3753
} from "~/store/seasons";
3854
55+
import VisualLeft from "~/assets/images/page/live-vote/visual-left.png";
56+
import VisualRight from "~/assets/images/page/live-vote/visual-right.png";
57+
3958
definePageMeta({
4059
layout: "empty",
4160
});
@@ -85,7 +104,8 @@
85104
86105
.container {
87106
display: grid;
88-
min-height: 100vh;
107+
min-height: 70vh;
108+
background-color: $fer-black;
89109
}
90110
91111
.result {
@@ -95,6 +115,7 @@
95115
justify-content: center;
96116
font-size: max(4.5rem, 8vw);
97117
text-shadow: 1px 1px 4px $fer-black;
118+
max-height: 70vh;
98119
99120
&[data-option="for"] {
100121
background-color: $fer-yellow;
@@ -107,10 +128,10 @@
107128
108129
.qrContainer {
109130
position: absolute;
110-
bottom: 0;
131+
top: 0;
111132
right: 0;
112133
left: 0;
113-
height: 40vh;
134+
height: 30vh;
114135
display: flex;
115136
116137
> div {

pages/profile/me/index.vue

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@
7272

7373
<template v-if="isSignUpPossible">
7474
<div :class="[$style.item, $style.signUp]">
75-
<div :class="$style.itemContent">
75+
<div :class="$style.itemContent" style="flex: 1;">
7676
<h2 :class="$style.itemHeader">
7777
<translated-text trans-key="profile.events.sign-up" />
7878
</h2>
@@ -937,6 +937,8 @@
937937
&.signUp {
938938
min-height: fit-content;
939939
grid-column: span 1;
940+
display: flex;
941+
flex-direction: column;
940942
941943
@media screen and (width <= 1500px) {
942944
grid-column: span var(--item-columns);

0 commit comments

Comments
 (0)