Merge remote-tracking branch 'origin/master'

This commit is contained in:
thilo 2020-03-22 23:15:50 +01:00
commit b8d2df33a0
5 changed files with 20 additions and 6 deletions

View file

@ -50,6 +50,16 @@
unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
}
@font-face {
font-family: 'Comfortaa';
font-style: normal;
font-weight: 400;
font-display: swap;
src: local('Comfortaa'), local('Comfortaa-Regular'), url(./assets/fonts/comfortaa.woff2) format('woff2');
unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
}
/* disables the rectangle feedback box when tapping something on a mobile device */
* {
-webkit-tap-highlight-color: rgba(0, 0, 0, 0);

Binary file not shown.

View file

@ -29,7 +29,7 @@
#information {
display: block;
margin: 0 auto;
margin-top: 5%;
padding: 5%;
font-size: 0.8em;
text-align: center;

View file

@ -1,6 +1,6 @@
<template>
<div class="questionnaire">
<img id="back-button" v-if="$route.params.id != 0" v-on:click="goBack()" src="../assets/arrow-circle-left-outline.svg">
<img id="back-button" v-on:click="goBack()" src="../assets/arrow-circle-left-outline.svg">
<div id="status-bar-wrapper">
<div class="progress">
<div v-bind:key="n" v-for="n in $store.state.questions.length" v-bind:class="getDotClass(n)"></div>
@ -32,6 +32,9 @@
const previousQuestion = parseInt(this.$route.params.id) - 1
this.$router.push("/questionnaire/" + previousQuestion)
}
else {
this.$router.push("/")
}
}
},
}

View file

@ -1,13 +1,10 @@
<template>
<div class="results">
<p>Ihre Wahrscheinlichkeit sich zu infizieren ist</p>
<p>Ihr Risiko sich und andere zu infizieren ist</p>
<p class="risk-chance alert" v-if="risk >= 66">hoch</p>
<p class="risk-chance warning" v-if="risk >= 33 && risk < 66">durchschnittlich</p>
<p class="risk-chance success" v-if="risk < 33 && risk >= 0">niedrig</p>
<p class="risk-chance" v-if=" risk < 0">nicht feststellbar</p>
<p class="text-center"><router-link style="text-decoration:none" to="/">
Zurück zum Anfang
</router-link></p>
<p v-if="bad.length > 0">Auf Folgendes sollten Sie achten:</p>
<div v-for="card in bad" v-bind:key="card.description" class="card-advice alert">
<div class="card-advice-title">{{ card.title }}</div>
@ -23,6 +20,9 @@
<div class="card-advice-title">{{ card.title }}</div>
<div class="card-advice-description">{{ card.description }}</div>
</div>
<p class="text-center"><router-link to="/">
Zurück zum Anfang
</router-link></p>
</div>
</template>
@ -115,6 +115,7 @@
text-align: center;
font-size: 1.5em;
font-weight: bold;
font-family: Comfortaa;
}
.risk-chance.success {
color: #62E160;