Skip to content
This repository was archived by the owner on Dec 8, 2022. It is now read-only.

Commit d62ed3b

Browse files
update Voting App.vue, CodeModal, ballot-modal.scss, fix some voting screen issues with the modal
1 parent 5bed06c commit d62ed3b

File tree

3 files changed

+75
-78
lines changed

3 files changed

+75
-78
lines changed

src/styles/ballot-modal.scss

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,16 @@
11
.v-dialog {
22
width: fit-content;
3-
max-width: 90%;
43
}
54

65
.v-card.ballot-modal {
76
padding: 0;
87
height: 600px;
8+
min-width: 1200px;
99
width: fit-content;
10-
min-width: 1000px;
10+
display: flex;
1111

1212
pre,
1313
code {
14-
width: 100% !important;
1514
height: 100%;
1615
background-color: $cwhqBlue;
1716
color: $cwhqYellow;
@@ -25,17 +24,23 @@
2524
padding: 20px;
2625
}
2726

28-
.main-row {
27+
28+
> * {
2929
height: 600px;
30+
}
3031

31-
> * {
32-
height: 600px;
33-
}
32+
.right {
33+
width: 380px;
34+
}
35+
36+
.v-form label {
37+
font-size: 15px !important;
3438
}
3539

3640
.left {
3741
padding: 20px;
3842
text-align: center;
43+
max-width: fit-content;
3944

4045
* {
4146
box-shadow: none !important;

src/views/Voting/App.vue

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<v-app class="cwhq-app voting">
33
<CWHQ-bar />
44
<!-- <app-bar /> -->
5-
<v-main>
5+
<v-main class="voting-main">
66
<router-view />
77
</v-main>
88
<mobile-warning />
@@ -23,3 +23,9 @@ export default {
2323
}
2424
};
2525
</script>
26+
27+
<style lang="scss" scoped>
28+
.voting-main {
29+
background: white;
30+
}
31+
</style>

src/views/Voting/CodeModal.vue

Lines changed: 56 additions & 70 deletions
Original file line numberDiff line numberDiff line change
@@ -8,79 +8,65 @@
88
light
99
v-if="isOpen"
1010
>
11-
<v-row class="main-row" no-gutters>
12-
<v-col cols="3" sm="12" md="3" class="left">
13-
<div class="circle">
14-
{{ initials }}
15-
</div>
16-
<div class="username mb-2">
17-
{{ username }}
18-
</div>
19-
<hr />
20-
<v-form lazy-validation @submit.prevent="submit">
21-
<v-text-field
22-
single-line
23-
outlined
24-
solo
25-
v-bind="fields.email"
26-
v-model="fields.email.value"
27-
:disabled="isSubmitting"
28-
/>
11+
<!-- <v-row class="main-row" no-gutters> -->
12+
<v-col cols="3" sm="12" md="3" class="left">
13+
<div class="circle">
14+
{{ initials }}
15+
</div>
16+
<div class="username mb-2">
17+
{{ username }}
18+
</div>
19+
<hr />
20+
<v-form lazy-validation @submit.prevent="submit">
21+
<v-text-field
22+
single-line
23+
outlined
24+
solo
25+
v-bind="fields.email"
26+
v-model="fields.email.value"
27+
:disabled="isSubmitting"
28+
/>
29+
<v-btn
30+
block
31+
tile
32+
color="cwhqBlue"
33+
type="submit"
34+
:disabled="isSubmitting"
35+
>Confirm Vote</v-btn
36+
>
37+
38+
<v-row no-gutters class="icons" justify="center">
2939
<v-btn
30-
block
31-
tile
40+
fab
3241
color="cwhqBlue"
33-
type="submit"
34-
:disabled="isSubmitting"
35-
>Confirm Vote</v-btn
42+
icon
43+
target="_blank"
44+
:href="facebookUrl"
3645
>
37-
38-
<v-row no-gutters class="icons" justify="center">
39-
<v-btn
40-
fab
41-
color="cwhqBlue"
42-
icon
43-
target="_blank"
44-
:href="facebookUrl"
45-
>
46-
<v-icon>mdi-facebook</v-icon>
47-
</v-btn>
48-
<v-btn
49-
fab
50-
color="cwhqBlue"
51-
icon
52-
target="_blank"
53-
:href="twitterUrl"
54-
>
55-
<v-icon>mdi-twitter</v-icon>
56-
</v-btn>
57-
<v-btn
58-
fab
59-
color="cwhqBlue"
60-
icon
61-
target="_blank"
62-
:href="mailUrl"
63-
>
64-
<v-icon>mdi-email</v-icon>
65-
</v-btn>
66-
<v-btn
67-
fab
68-
color="cwhqBlue"
69-
icon
70-
target="_blank"
71-
:href="linkUrl"
72-
>
73-
<v-icon>mdi-link</v-icon>
74-
</v-btn>
75-
</v-row>
76-
</v-form>
77-
</v-col>
78-
<v-col class="right">
79-
<pre
80-
v-highlightjs="sourceCode"
81-
><code :class="codeType"></code></pre>
82-
</v-col>
83-
</v-row>
46+
<v-icon>mdi-facebook</v-icon>
47+
</v-btn>
48+
<v-btn
49+
fab
50+
color="cwhqBlue"
51+
icon
52+
target="_blank"
53+
:href="twitterUrl"
54+
>
55+
<v-icon>mdi-twitter</v-icon>
56+
</v-btn>
57+
<v-btn fab color="cwhqBlue" icon target="_blank" :href="mailUrl">
58+
<v-icon>mdi-email</v-icon>
59+
</v-btn>
60+
<v-btn fab color="cwhqBlue" icon target="_blank" :href="linkUrl">
61+
<v-icon>mdi-link</v-icon>
62+
</v-btn>
63+
</v-row>
64+
</v-form>
65+
</v-col>
66+
<v-col class="right">
67+
<pre v-highlightjs="sourceCode"><code :class="codeType"></code></pre>
68+
</v-col>
69+
<!-- </v-row> -->
8470
</v-card>
8571
</v-dialog>
8672

0 commit comments

Comments
 (0)