Merge branch 'main' into main

corona-warn-app · Jan 11, 2022 · ad5fd92 · ad5fd92
2 parents 3c39727 + 7d50b08
commit ad5fd92
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 24 deletions.
diff --git a/static/assets/less/cwatc.less b/static/assets/less/cwatc.less
@@ -204,9 +204,14 @@ a {
   #header {
     height: 4rem;
   }
+
+  #content {
+    top: 4rem;
+  }
+
   #searchPanel {
-    width: 50%;
-    margin: 0 25%;
+    width: 60%;
+    margin: 0 20%;
   }
 
   .cwa-heading {

diff --git a/static/datenschutz.html b/static/datenschutz.html
@@ -141,7 +141,7 @@
 
 <div id="footer" style="position: fixed">
     <a class="text-light" href="/impressum.html">Impressum</a>
-    <a class="text-light" href="/privacy.html">Datenschutzerklärung</a>
+    <a class="text-light" href="/datenschutz.html">Datenschutzerklärung</a>
     <a class="text-light" href="/usage.html">Hilfe</a>
     <a class="text-light" href="https://github.com/corona-warn-app/cwa-quicktest-onboarding/wiki">Schnelltestpartner
         werden</a>

diff --git a/static/impressum.html b/static/impressum.html
@@ -95,7 +95,7 @@
 
 <div id="footer">
     <a class="text-light" href="/impressum.html">Impressum</a>
-    <a class="text-light" href="/privacy.html">Datenschutzerklärung</a>
+    <a class="text-light" href="/datenschutz.html">Datenschutzerklärung</a>
     <a class="text-light" href="/usage.html">Hilfe</a>
     <a class="text-light" href="https://github.com/corona-warn-app/cwa-quicktest-onboarding/wiki">Schnelltestpartner
         werden</a>

diff --git a/static/index.html b/static/index.html
@@ -69,10 +69,10 @@
 
             <div id="collapseOne" class="accordion-collapse collapse" aria-labelledby="headingOne"
                  data-bs-parent="#searchPanel">
-                <div class="accordion-body" style="padding: .5rem">
-                    <div class="filter-items d-flex flex-column flex-lg-row">
-                        <div class="filter-item d-flex justify-content-between my-1 align-content-center">
-                            <div class="searchLabel">
+                <div class="accordion-body" style="padding: .2rem">
+                    <div class="filter-items d-flex flex-column flex-xl-row">
+                        <div class="filter-item d-flex justify-content-between my-1 align-items-center">
+                            <div class="searchLabel mx-1">
                                 <span class="text-dark"><i class="fas fa-calendar-alt fa-fw"></i></span>Termin:
                             </div>
                             <div class="dropdown searchDropdown terminDropdown">
@@ -87,8 +87,8 @@
 
                         </div>
 
-                        <div class="filter-item d-flex justify-content-between my-1">
-                            <div class="searchLabel">
+                        <div class="filter-item d-flex justify-content-between my-1 align-items-center">
+                            <div class="searchLabel mx-1">
                                 <span class="text-dark"><i class="fas fa-prescription-bottle-alt fa-fw"></i></span>Test-Art:
                             </div>
                             <div class="dropdown searchDropdown testArtDropdown">
@@ -102,24 +102,19 @@
                             </div>
                         </div>
 
-                        <div class="filter-item d-flex justify-content-between my-1">
-
-                            <div class="searchLabel">
-                                <label class="form-check-label" for="dcc-checkbox">
-                                    <img id="dccLabel" title="Digital Covid Pass"
-                                         alt="Digital Covid Certificate"
-                                         class="align-self-center me-1 dcc-logo" style="height: 25px"
-                                         src="/img/dcc.png"/>
+                        <div class="filter-item d-flex justify-content-between my-1 align-items-center">
+                            <div class="searchLabel d-flex align-items-center">
+                                <img id="dccLabel" title="Digital Covid Pass"
+                                     alt="Digital Covid Certificate"
+                                     class="dcc-logo" style="height: 25px"
+                                     src="/img/dcc.png"/>
+                                <label class="form-check-label mx-1" for="dcc-checkbox">
                                     Digital Covid Certificate:
                                 </label>
                             </div>
-
-                            <div>
                                 <div class="form-check">
                                     <input class="form-check-input" type="checkbox" value="" id="dcc-checkbox"/>
                                 </div>
-                            </div>
-
                         </div>
 
                     </div>
@@ -149,7 +144,7 @@
 
 <div id="footer">
     <a class="text-light" href="/impressum.html">Impressum</a>
-    <a class="text-light" href="/privacy.html">Datenschutzerklärung</a>
+    <a class="text-light" href="/datenschutz.html">Datenschutzerklärung</a>
     <a class="text-light" href="/usage.html">Hilfe</a>
     <a class="text-light" href="https://github.com/corona-warn-app/cwa-quicktest-onboarding/wiki">Schnelltestpartner
         werden</a>

diff --git a/static/usage.html b/static/usage.html
@@ -84,7 +84,7 @@ <h3>Empfangen Sie Ihr Testergebnis in der Corona-Warn-App</h3>
 
 <div id="footer">
     <a class="text-light" href="/impressum.html">Impressum</a>
-    <a class="text-light" href="/privacy.html">Datenschutzerklärung</a>
+    <a class="text-light" href="/datenschutz.html">Datenschutzerklärung</a>
     <a class="text-light" href="/usage.html">Hilfe</a>
     <a class="text-light" href="https://github.com/corona-warn-app/cwa-quicktest-onboarding/wiki">Schnelltestpartner
         werden</a>