Skip to content

Commit

Permalink
update logo and main page
Browse files Browse the repository at this point in the history
  • Loading branch information
MarkCherepovskyi committed Mar 24, 2024
1 parent 5c94b72 commit d82c085
Show file tree
Hide file tree
Showing 7 changed files with 24 additions and 8 deletions.
7 changes: 6 additions & 1 deletion src/common/AppLogo.vue
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<div class="app-logo">
<img
class="app-logo__img"
src="/branding/logo.svg"
src="/branding/logo.png"
:alt="$config.APP_NAME"
/>
<router-link class="app-logo__link" :to="{ name: $routes.home }" />
Expand All @@ -18,6 +18,11 @@
position: relative;
}
.app-logo__img {
max-width: toRem(60);
max-height: toRem(60);
}
.app-logo__link {
position: absolute;
top: 0;
Expand Down
1 change: 1 addition & 0 deletions src/common/VoteCard.vue
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,7 @@ const select = () => {
.vote-card__btn {
margin: toRem(16) auto;
width: 100%;
}
.vote-item__lbl {
Expand Down
6 changes: 3 additions & 3 deletions src/common/modals/QrAuthModal.vue
Original file line number Diff line number Diff line change
Expand Up @@ -45,14 +45,14 @@ watch(props, init)
display: grid;
width: 100%;
height: 100%;
max-width: toRem(500);
max-height: toRem(500);
max-width: toRem(400);
max-height: toRem(400);
background: var(--background-primary-dark);
border-radius: toRem(24);
}
.qr-auth-modal__img {
margin: auto;
width: 50%;
width: 80%;
}
</style>
3 changes: 2 additions & 1 deletion src/localization/resources/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,8 @@
"active-until-lbl": "Active until",
"first-place": "First choice",
"second-place": "Second choice",
"third-place": "Third choice"
"third-place": "Third choice",
"select-btn-txt": "Select"
},
"home": {
"title": "Voting platform"
Expand Down
4 changes: 2 additions & 2 deletions src/pages/Home.vue
Original file line number Diff line number Diff line change
Expand Up @@ -43,10 +43,10 @@ init()
.home-page__title {
text-align: center;
margin-bottom: toRem(16);
margin: toRem(50) 0;
}
.home-page__list {
margin: auto;
margin: toRem(100) auto;
}
</style>
11 changes: 10 additions & 1 deletion src/pages/Vote.vue
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,14 @@
import { computed, ref } from 'vue'
import { VoteOptions, Voting } from '@/types'
import { AppButton, Optionitem, QrAuthModal } from '@/common'
import { auth, ErrorHandler, getVotingById, sleep } from '@/helpers'
import {
auth,
bus,
BUS_EVENTS,
ErrorHandler,
getVotingById,
sleep,
} from '@/helpers'
import { useI18n } from 'vue-i18n'
import { v4 as uuidv4 } from 'uuid'
Expand Down Expand Up @@ -146,6 +153,8 @@ const vote = async () => {
}
await validate()
isModalShown.value = false
bus.emit(BUS_EVENTS.success)
}
const validate = async () => {
Expand Down
Binary file added static/branding/logo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit d82c085

Please sign in to comment.