Fix some oversights
This commit is contained in:
parent
39f8cbf113
commit
5740dba92c
|
@ -24,13 +24,8 @@ function Page(props: PageProps): JSX.Element {
|
||||||
{props.content}
|
{props.content}
|
||||||
|
|
||||||
<footer>
|
<footer>
|
||||||
<<<<<<< HEAD
|
|
||||||
<nav className="nav flex pt-4 flex-row space-x-4 justify-center text-md font-bold flex-wrap">
|
<nav className="nav flex pt-4 flex-row space-x-4 justify-center text-md font-bold flex-wrap">
|
||||||
<a href="https://github.com/jantsop/covidpass" className="hover:underline">{t('common:gitHub')}</a>
|
<a href="https://github.com/jantsop/covidpass" className="hover:underline">{t('common:gitHub')}</a>
|
||||||
=======
|
|
||||||
<nav className="nav flex flex-row space-x-4 justify-center text-md font-bold flex-wrap">
|
|
||||||
<a href="https://github.com/marvinsxtr/covidpass" className="hover:underline">{t('common:gitHub')}</a>
|
|
||||||
>>>>>>> 68387b1eaef1fe256d04b3c888afb61967115ccf
|
|
||||||
<Link href="/privacy"><a className="hover:underline">{t('common:privacyPolicy')}</a></Link>
|
<Link href="/privacy"><a className="hover:underline">{t('common:privacyPolicy')}</a></Link>
|
||||||
</nav>
|
</nav>
|
||||||
</footer>
|
</footer>
|
||||||
|
|
|
@ -49,20 +49,12 @@ function Privacy(): JSX.Element {
|
||||||
</div>
|
</div>
|
||||||
<p className="font-bold">{t('privacy:contact')}</p>
|
<p className="font-bold">{t('privacy:contact')}</p>
|
||||||
<p>
|
<p>
|
||||||
<<<<<<< HEAD
|
|
||||||
Jantso Porali<br/>
|
Jantso Porali<br/>
|
||||||
Rakentajanpolku 3H<br/>
|
Rakentajanpolku 3H<br/>
|
||||||
96960 Rovaniemi<br/>
|
96960 Rovaniemi<br/>
|
||||||
{t('privacy:email')}:
|
{t('privacy:email')}:
|
||||||
|
|
||||||
<a href="mailto:jantso.porali@gmail.com">jantso.porali@gmail.com</a>
|
<a href="mailto:jantso.porali@gmail.com">jantso.porali@gmail.com</a>
|
||||||
=======
|
|
||||||
Marvin Sextro
|
|
||||||
<br/>
|
|
||||||
{t('privacy:email')}:
|
|
||||||
|
|
||||||
<a href="mailto:covidpass@marvinsextro.de" className="underline">covidpass@marvinsextro.de</a>
|
|
||||||
>>>>>>> 68387b1eaef1fe256d04b3c888afb61967115ccf
|
|
||||||
<br/>
|
<br/>
|
||||||
</p>
|
</p>
|
||||||
<p className="font-bold">{t('privacy:process')}</p>
|
<p className="font-bold">{t('privacy:process')}</p>
|
||||||
|
@ -140,16 +132,6 @@ function Privacy(): JSX.Element {
|
||||||
</a>
|
</a>
|
||||||
</li>
|
</li>
|
||||||
<li>
|
<li>
|
||||||
<<<<<<< HEAD
|
|
||||||
=======
|
|
||||||
Ko-fi:
|
|
||||||
|
|
||||||
<a href="https://more.ko-fi.com/privacy" className="underline">
|
|
||||||
{t('common:privacyPolicy')}
|
|
||||||
</a>
|
|
||||||
</li>
|
|
||||||
<li>
|
|
||||||
>>>>>>> 68387b1eaef1fe256d04b3c888afb61967115ccf
|
|
||||||
Gmail/Google:
|
Gmail/Google:
|
||||||
|
|
||||||
<a href="https://policies.google.com/privacy?hl=fi-FI" className="underline">
|
<a href="https://policies.google.com/privacy?hl=fi-FI" className="underline">
|
||||||
|
@ -159,11 +141,7 @@ function Privacy(): JSX.Element {
|
||||||
<li>
|
<li>
|
||||||
{t('privacy:appleSync')}:
|
{t('privacy:appleSync')}:
|
||||||
|
|
||||||
<<<<<<< HEAD
|
|
||||||
<a href="https://www.apple.com/fi/legal/privacy/fi/" className="underline">
|
<a href="https://www.apple.com/fi/legal/privacy/fi/" className="underline">
|
||||||
=======
|
|
||||||
<a href="https://www.apple.com/legal/privacy/en-ww/" className="underline">
|
|
||||||
>>>>>>> 68387b1eaef1fe256d04b3c888afb61967115ccf
|
|
||||||
{t('common:privacyPolicy')}
|
{t('common:privacyPolicy')}
|
||||||
</a>
|
</a>
|
||||||
</li>
|
</li>
|
||||||
|
|
Loading…
Reference in New Issue