diff --git a/content/index.html b/content/index.html
index f879521eb3dabb6178ded624271c09c36361e3b1..0f94d97554c54807e506bb4e8cb86ab9b55a679a 100644
--- a/content/index.html
+++ b/content/index.html
@@ -28,7 +28,11 @@
<link
rel="stylesheet"
- href="static/fonts/open-sans/style.css"
+ href="static/fonts/roboto-condensed/style.css"
+ >
+ <link
+ rel="stylesheet"
+ href="static/fonts/bebas-neue/style.css"
>
<link
@@ -63,10 +67,8 @@
height="55"
>
</div>
- </header>
-
- <main>
- <div id="step1">
+
+ <div id="intro-wrapper">
<h1>Vyřiď si svůj voličský průkaz na prezidentské volby!</h1>
<p id="intro-text">
@@ -85,7 +87,11 @@
První kolo se bude konat 13. - 14. ledna 2023.<br>
Druhé kolo se bude konat 27. - 28. ledna 2023.
</p>
-
+ </div>
+ </header>
+
+ <main>
+ <div id="step1">
<form id="form-wrapper">
<h2 class="info-type">Osobní informace</h2>
diff --git a/content/static/css/base.css b/content/static/css/base.css
index 4a6d365c4dbb7e221829dde7097e1a91e67d4ee9..41b059231d06c27f50e4a02d6c5d8bccbaff3261 100644
--- a/content/static/css/base.css
+++ b/content/static/css/base.css
@@ -12,7 +12,7 @@
width:100%
}
-#finish,#download-pdf {
+#finish,#download-paper-pdf,#download-electronic-pdf {
margin-top:20px
}
@@ -38,6 +38,12 @@
padding-bottom:14px
}
+#intro-wrapper {
+ margin-left:auto;
+ margin-right:auto;
+ max-width:750px
+}
+
#logo {
align-items:center;
display:flex;
@@ -119,7 +125,7 @@
}
.info-type {
- font-size:1.2rem;
+ font-size:1.6rem;
margin:0;
text-align:center
}
@@ -130,37 +136,43 @@ a,a:hover,a:visited {
body {
background:#000;
- font-family:"Open Sans",sans-serif
+ font-family:"Roboto Condensed",sans-serif
}
button,input[type="submit"],[aria-role="button"] {
- background:#2f2f2f;
+ background:#f9ce05;
border:none;
- color:#fff;
+ color:#000;
cursor:pointer;
display:inline-block;
- font-size:unset;
+ font-family:"Bebas Neue";
+ font-size:1.35rem;
padding:12px;
text-decoration:none;
transition:.15s
}
button:not([disabled]):hover,input[type="submit"]:not([disabled]):hover,[aria-role="button"]:not([disabled]):hover {
- background:#333
+ background:#000;
+ color:#f9ce05
}
button[disabled],input[type="submit"][disabled],[aria-role="button"][disabled] {
- background:#737373;
+ background:#f9ce0575;
cursor:unset
}
header {
+ align-items:center;
background:#000;
color:#fff;
display:flex;
- height:70px;
- justify-content:center;
- padding:10px
+ flex-direction:column;
+ padding:25px 0 10px 0
+}
+
+header a,header a:visited {
+ color:#fff
}
html,body {
@@ -168,10 +180,19 @@ html,body {
padding:0
}
+h1,h2,h3,h4,h5,h6 {
+ font-family:"Bebas Neue",sans-serif;
+ text-transform:uppercase
+}
+
+h1 {
+ font-size:39px
+}
+
input,[aria-role="textbox"],textarea,select {
background:#dddcdc;
border:0;
- font-family:"Open Sans",sans-serif;
+ font-family:"Roboto Condensed",sans-serif;
font-size:medium;
padding:10px
}
@@ -180,7 +201,7 @@ main {
background:#fff;
border-top-left-radius:40px;
border-top-right-radius:40px;
- min-height:calc(100vh - 90px)
+ min-height:calc(100vh - 350px);
}
textarea {
diff --git a/content/static/fonts/bebas-neue/bebas-neue-v9-latin-ext_latin-regular.woff b/content/static/fonts/bebas-neue/bebas-neue-v9-latin-ext_latin-regular.woff
new file mode 100644
index 0000000000000000000000000000000000000000..0732bea5efc1981d60fcbf8fcd5489c1317af05e
Binary files /dev/null and b/content/static/fonts/bebas-neue/bebas-neue-v9-latin-ext_latin-regular.woff differ
diff --git a/content/static/fonts/bebas-neue/bebas-neue-v9-latin-ext_latin-regular.woff2 b/content/static/fonts/bebas-neue/bebas-neue-v9-latin-ext_latin-regular.woff2
new file mode 100644
index 0000000000000000000000000000000000000000..6162390b2e3a557f2b49d49745dcbf67b88cd8f2
Binary files /dev/null and b/content/static/fonts/bebas-neue/bebas-neue-v9-latin-ext_latin-regular.woff2 differ
diff --git a/content/static/fonts/bebas-neue/style.css b/content/static/fonts/bebas-neue/style.css
new file mode 100644
index 0000000000000000000000000000000000000000..26e05631613778362c6c173cbdd353fbaa20e655
--- /dev/null
+++ b/content/static/fonts/bebas-neue/style.css
@@ -0,0 +1,13 @@
+/*
+ * Thanks to majodev for their Google webfont helper!
+ */
+
+/* bebas-neue-regular - latin-ext_latin */
+@font-face {
+ font-family: 'Bebas Neue';
+ font-style: normal;
+ font-weight: 400;
+ src:
+ url('./bebas-neue-v9-latin-ext_latin-regular.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
+ url('./bebas-neue-v9-latin-ext_latin-regular.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
+}
diff --git a/content/static/fonts/open-sans/open-sans-v29-latin-ext_latin-600.woff b/content/static/fonts/open-sans/open-sans-v29-latin-ext_latin-600.woff
deleted file mode 100644
index 8cfc705e6e79574f8b8ea710946bf5c1b2d18189..0000000000000000000000000000000000000000
Binary files a/content/static/fonts/open-sans/open-sans-v29-latin-ext_latin-600.woff and /dev/null differ
diff --git a/content/static/fonts/open-sans/open-sans-v29-latin-ext_latin-600.woff2 b/content/static/fonts/open-sans/open-sans-v29-latin-ext_latin-600.woff2
deleted file mode 100644
index c1ae99e8e2d932f4561bd97738e79b4eda04be2b..0000000000000000000000000000000000000000
Binary files a/content/static/fonts/open-sans/open-sans-v29-latin-ext_latin-600.woff2 and /dev/null differ
diff --git a/content/static/fonts/open-sans/open-sans-v29-latin-ext_latin-600italic.woff b/content/static/fonts/open-sans/open-sans-v29-latin-ext_latin-600italic.woff
deleted file mode 100644
index 1b08b04e3ec0311675b09c3267dfd25ae566356c..0000000000000000000000000000000000000000
Binary files a/content/static/fonts/open-sans/open-sans-v29-latin-ext_latin-600italic.woff and /dev/null differ
diff --git a/content/static/fonts/open-sans/open-sans-v29-latin-ext_latin-600italic.woff2 b/content/static/fonts/open-sans/open-sans-v29-latin-ext_latin-600italic.woff2
deleted file mode 100644
index 1e8632beddc3d586eda85e1fd61fadcea8b11879..0000000000000000000000000000000000000000
Binary files a/content/static/fonts/open-sans/open-sans-v29-latin-ext_latin-600italic.woff2 and /dev/null differ
diff --git a/content/static/fonts/open-sans/open-sans-v29-latin-ext_latin-italic.woff b/content/static/fonts/open-sans/open-sans-v29-latin-ext_latin-italic.woff
deleted file mode 100644
index 566004ab15cef21032d3cc98d3d958d08dc3bafd..0000000000000000000000000000000000000000
Binary files a/content/static/fonts/open-sans/open-sans-v29-latin-ext_latin-italic.woff and /dev/null differ
diff --git a/content/static/fonts/open-sans/open-sans-v29-latin-ext_latin-italic.woff2 b/content/static/fonts/open-sans/open-sans-v29-latin-ext_latin-italic.woff2
deleted file mode 100644
index aa7302d8ba49ae942d26395063e9f632b2d6063f..0000000000000000000000000000000000000000
Binary files a/content/static/fonts/open-sans/open-sans-v29-latin-ext_latin-italic.woff2 and /dev/null differ
diff --git a/content/static/fonts/open-sans/open-sans-v29-latin-ext_latin-regular.woff b/content/static/fonts/open-sans/open-sans-v29-latin-ext_latin-regular.woff
deleted file mode 100644
index 15e46275e20f80ef6fc935afbc0ba68085c5cd4f..0000000000000000000000000000000000000000
Binary files a/content/static/fonts/open-sans/open-sans-v29-latin-ext_latin-regular.woff and /dev/null differ
diff --git a/content/static/fonts/open-sans/open-sans-v29-latin-ext_latin-regular.woff2 b/content/static/fonts/open-sans/open-sans-v29-latin-ext_latin-regular.woff2
deleted file mode 100644
index b3da40eeac3099ce354b1c45c433886371c2e3e5..0000000000000000000000000000000000000000
Binary files a/content/static/fonts/open-sans/open-sans-v29-latin-ext_latin-regular.woff2 and /dev/null differ
diff --git a/content/static/fonts/open-sans/style.css b/content/static/fonts/open-sans/style.css
deleted file mode 100644
index 6bac5d7977c56fe6b783d3635dfc92d9053573e0..0000000000000000000000000000000000000000
--- a/content/static/fonts/open-sans/style.css
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
-* Thanks to majodev for their Google webfont helper!
-*/
-
-/* open-sans-regular - latin */
-@font-face {
-font-family: 'Open Sans';
-font-style: normal;
-font-weight: 400;
-src: local(''),
- url('./open-sans-v29-latin-ext_latin-regular.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
- url('./open-sans-v29-latin-ext_latin-regular.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
-}
-
-/* open-sans-600 - latin */
-@font-face {
-font-family: 'Open Sans';
-font-style: normal;
-font-weight: 600;
-src: local(''),
- url('./open-sans-v29-latin-ext_latin-600.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
- url('./open-sans-v29-latin-ext_latin-600.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
-}
-
-/* open-sans-italic - latin */
-@font-face {
-font-family: 'Open Sans';
-font-style: italic;
-font-weight: 400;
-src: local(''),
- url('./open-sans-v29-latin-ext_latin-italic.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
- url('./open-sans-v29-latin-ext_latin-italic.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
-}
-
-/* open-sans-600italic - latin */
-@font-face {
-font-family: 'Open Sans';
-font-style: italic;
-font-weight: 600;
-src: local(''),
- url('./open-sans-v29-latin-ext_latin-600italic.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
- url('./open-sans-v29-latin-ext_latin-600italic.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
-}
diff --git a/content/static/fonts/roboto-condensed/roboto-condensed-v25-latin-ext_latin-700.woff b/content/static/fonts/roboto-condensed/roboto-condensed-v25-latin-ext_latin-700.woff
new file mode 100644
index 0000000000000000000000000000000000000000..44babe715a0051ffcba0793adcb47b1a712ae717
Binary files /dev/null and b/content/static/fonts/roboto-condensed/roboto-condensed-v25-latin-ext_latin-700.woff differ
diff --git a/content/static/fonts/roboto-condensed/roboto-condensed-v25-latin-ext_latin-700.woff2 b/content/static/fonts/roboto-condensed/roboto-condensed-v25-latin-ext_latin-700.woff2
new file mode 100644
index 0000000000000000000000000000000000000000..0faca7d8831cfbc086ae04c278b019bd1245c0d6
Binary files /dev/null and b/content/static/fonts/roboto-condensed/roboto-condensed-v25-latin-ext_latin-700.woff2 differ
diff --git a/content/static/fonts/roboto-condensed/roboto-condensed-v25-latin-ext_latin-regular.woff b/content/static/fonts/roboto-condensed/roboto-condensed-v25-latin-ext_latin-regular.woff
new file mode 100644
index 0000000000000000000000000000000000000000..a72d2dc16a924284ae0d51cae2d41be2af633fcc
Binary files /dev/null and b/content/static/fonts/roboto-condensed/roboto-condensed-v25-latin-ext_latin-regular.woff differ
diff --git a/content/static/fonts/roboto-condensed/roboto-condensed-v25-latin-ext_latin-regular.woff2 b/content/static/fonts/roboto-condensed/roboto-condensed-v25-latin-ext_latin-regular.woff2
new file mode 100644
index 0000000000000000000000000000000000000000..d01025018ecdc5e48cb737c7c4477120c0e53504
Binary files /dev/null and b/content/static/fonts/roboto-condensed/roboto-condensed-v25-latin-ext_latin-regular.woff2 differ
diff --git a/content/static/fonts/roboto-condensed/style.css b/content/static/fonts/roboto-condensed/style.css
new file mode 100644
index 0000000000000000000000000000000000000000..425970648bd915e5fd7305a3a021ffe3894e7494
--- /dev/null
+++ b/content/static/fonts/roboto-condensed/style.css
@@ -0,0 +1,23 @@
+/*
+ * Thanks to majodev for their Google webfont helper!
+ */
+
+/* roboto-condensed-regular - latin-ext_latin */
+@font-face {
+ font-family: 'Roboto Condensed';
+ font-style: normal;
+ font-weight: normal;
+ src: local(''),
+ url('roboto-condensed-v25-latin-ext_latin-regular.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
+ url('roboto-condensed-v25-latin-ext_latin-regular.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
+}
+
+/* roboto-condensed-700 - latin-ext_latin */
+@font-face {
+ font-family: 'Roboto Condensed';
+ font-style: normal;
+ font-weight: bold;
+ src: local(''),
+ url('roboto-condensed-v25-latin-ext_latin-700.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
+ url('roboto-condensed-v25-latin-ext_latin-700.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
+}
diff --git a/content/static/js/main.js b/content/static/js/main.js
index 8135e806f1accd3726cb024c381f832a2452f5ed..8ae649cd09bf7831171fdad1ad822992e42b14b7 100644
--- a/content/static/js/main.js
+++ b/content/static/js/main.js
@@ -408,8 +408,14 @@ $(window).ready(
}
await new Promise(
- resolve => { $("#step1").fadeOut(200, resolve); }
+ resolve => {
+ $("#intro-wrapper").slideUp(200);
+ $("#step1").fadeOut(200, resolve);
+ }
);
+
+ $("header").css("padding", "17.5px");
+ $("main").css("min-height", "calc(100vh - 90px)");
$("#step1").css("display", "none");
await new Promise(