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

Commit 0028af3

Browse files
Merge pull request #235 from codewizardshq/vote-work
add image for Ballot, update text, fix styling in Voting/App, VoteWoa…
2 parents 07e6ed2 + 641fc2a commit 0028af3

File tree

5 files changed

+36
-38
lines changed

5 files changed

+36
-38
lines changed
42.4 KB
Loading

src/views/Voting/App.vue

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,3 @@ export default {
2323
}
2424
};
2525
</script>
26-
27-
<style lang="scss" scoped>
28-
.voting-main {
29-
background: white;
30-
}
31-
</style>

src/views/Voting/Ballot.vue

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<template>
2-
<div>
2+
<div class="ballot-wrapper">
33
<div class="image first pb-9">
44
<v-container>
55
<v-row class="content">
@@ -12,13 +12,15 @@
1212

1313
<div style="max-width:600px; margin: auto;">
1414
<h2>
15-
Vote For The Winner of The Dragon Quest
15+
Vote For The Top 10 Challengers
1616
</h2>
1717
<div>
18-
Congratulations to all {{ totalEntries }} finalists, kid coders
19-
who have correctly solved 21 levels of coding questions! Each
20-
challenger below has also correctly answered our boss question
21-
correctly and qualified for the grand prize.
18+
Congratulations to all of our finalists! Each challenger below
19+
has correctly answered our boss question and qualified for the
20+
grand prize. Vote for your favorite hero below. The challengers
21+
with the top 10 total votes will have their code graded by the
22+
Galactic Wizard Panel (a team of CodeWizardsHQ instructors) to
23+
win the $100 grand prize. Voting takes place May 3 - 7.
2224
</div>
2325
</div>
2426
</v-col>
@@ -293,6 +295,10 @@ export default {
293295
</script>
294296

295297
<style lang="scss" scoped>
298+
.ballot-wrapper {
299+
background-color: white;
300+
}
301+
296302
h2 {
297303
text-align: center;
298304
color: #0d1d41;
@@ -310,7 +316,7 @@ h2 {
310316
$height: 550px;
311317
background-size: cover;
312318
min-height: $height;
313-
background-image: url("https://codewizardshq.com/wp-content/uploads/2020/01/landing-bg.jpg");
319+
background-image: url("/images/website-banner-challenge-2021.png");
314320
&:after {
315321
content: "";
316322
display: block;

src/views/Voting/VoteWoah.vue

Lines changed: 14 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,27 @@
11
<template>
2-
<div class="vote-woah-container">
3-
<v-container>
4-
<v-row>
5-
<v-col class="inside-div">
6-
<h2 class="ballot-header">
7-
Woah, voting has not started yet!
8-
</h2>
9-
<p>
10-
Our challengers are hard at work. Come back on May 3 to vote for the
11-
winner.
12-
</p>
13-
</v-col>
14-
</v-row>
15-
</v-container>
16-
</div>
2+
<v-container>
3+
<v-row>
4+
<v-col class="inside-div">
5+
<h2 class="ballot-header">
6+
Woah, voting has not started yet!
7+
</h2>
8+
<p>
9+
Our challengers are hard at work. Come back on May 3 to vote for the
10+
winner.
11+
</p>
12+
</v-col>
13+
</v-row>
14+
</v-container>
1715
</template>
1816

1917
<script>
18+
// TODO: this and VotingOver should be a single component with props
2019
export default {
2120
name: "VotingWoah"
2221
};
2322
</script>
2423

2524
<style lang="scss" scoped>
26-
.vote-woah-container {
27-
height: 100%;
28-
width: 100%;
29-
background: url("/images/space-background.jpg");
30-
}
31-
3225
.inside-div {
3326
background: gray;
3427
}

src/views/Voting/VotingOver.vue

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<template>
22
<v-container>
33
<v-row>
4-
<v-col>
4+
<v-col class="inside-div">
55
<h2 class="ballot-header">
66
Voting is over!
77
</h2>
@@ -14,23 +14,28 @@
1414
</template>
1515

1616
<script>
17+
// TODO: this and VoteWoah should be a single component with props
1718
export default {
18-
name: 'VotingWoah',
19+
name: "VotingWoah"
1920
};
2021
</script>
2122

2223
<style lang="scss" scoped>
24+
.inside-div {
25+
background: gray;
26+
}
27+
2328
h2 {
2429
text-align: center;
2530
color: #0d1d41;
26-
font-family: 'Barlow', sans-serif;
31+
font-family: "Barlow", sans-serif;
2732
font-weight: bold;
2833
margin-bottom: 12px;
2934
}
3035
3136
p {
3237
text-align: center;
3338
color: #0d1d41;
34-
font-family: 'Barlow', sans-serif;
39+
font-family: "Barlow", sans-serif;
3540
}
3641
</style>

0 commit comments

Comments
 (0)