From c61f6f1799860e339de61b644a54c8ef64ab7a9b Mon Sep 17 00:00:00 2001
From: Denys Konovalov <kontakt@denyskon.de>
Date: Wed, 23 Oct 2024 21:57:59 +0200
Subject: [PATCH] fix contrasts

---
 assets/css/style.css                          | 76 +++++++++----------
 config.yml                                    |  2 +-
 layouts/about/list.html                       |  4 +-
 layouts/index.html                            | 14 ++--
 layouts/partials/termin.html                  |  2 +-
 .../previews/page-previews/about-preview.js   |  4 +-
 .../previews/page-previews/event-preview.js   |  2 +-
 7 files changed, 50 insertions(+), 54 deletions(-)

diff --git a/assets/css/style.css b/assets/css/style.css
index f46c0981..4198365a 100644
--- a/assets/css/style.css
+++ b/assets/css/style.css
@@ -197,6 +197,10 @@ a h4:hover {
   color: var(--gcg-color-primary) !important;
 }
 
+.text-secondary {
+  color: var(--gcg-color-secondary) !important;
+}
+
 .text-muted {
   color: var(--gcg-color-grey) !important;
 }
@@ -260,7 +264,7 @@ textarea.form-control {
 
 .pagination .page-item.active .page-link {
   background: var(--gcg-color-primary);
-  color: white;
+  color: var(--gcg-color-secondary);
   border-color: var(--gcg-color-primary);
 }
 
@@ -432,7 +436,7 @@ details[open] summary {
 
 .tag-list a:hover {
   background: var(--gcg-color-primary);
-  color: white;
+  color: var(--gcg-color-secondary);
 }
 
 .hover-shadow {
@@ -550,7 +554,7 @@ details[open] summary {
   width: 80px;
   border-radius: 50%;
   background: var(--gcg-color-primary);
-  color: white;
+  color: var(--gcg-color-secondary);
   font-size: 25px;
   display: flex;
   align-items: center;
@@ -563,7 +567,7 @@ details[open] summary {
   height: 0;
   width: 0;
   transform: translate(-50%, -50%);
-  background: white;
+  background: var(--gcg-color-secondary);
   border-radius: 50%;
   top: 50%;
   left: 50%;
@@ -664,7 +668,7 @@ details[open] summary {
   height: 6px;
   width: 100%;
   content: "";
-  background: white;
+  background: var(--gcg-color-secondary);
   transform: scaleY(0);
   transform-origin: top;
   transition: transform 0.3s ease;
@@ -677,19 +681,19 @@ details[open] summary {
 }
 
 .navbar-dark .navbar-nav .nav-link {
-  color: white;
+  color: var(--gcg-color-secondary);
 }
 
 link:focus,
 .navbar-dark .navbar-nav .nav-link:hover {
-  color: white;
+  color: var(--gcg-color-secondary);
 }
 
 .navbar-dark .navbar-nav .active > .nav-link,
 .navbar-dark .navbar-nav .nav-link.active,
 .navbar-dark .navbar-nav .nav-link.show,
 .navbar-dark .navbar-nav .show > .nav-link {
-  color: white;
+  color: var(--gcg-color-secondary);
 }
 
 .navbar-expand-xl .navbar-nav .nav-link {
@@ -733,8 +737,8 @@ link:focus,
 }
 
 .navbar .dropdown-item:hover {
-  color: var(--gcg-color-primary);
-  background: transparent;
+  color: var(--gcg-color-secondary);
+  background: var(--gcg-color-primary);
 }
 
 /* button styles */
@@ -787,7 +791,8 @@ link:focus,
 
 .btn-primary {
   background: var(--gcg-color-primary);
-  color: white;
+  color: var(--gcg-color-secondary);
+  border: 1px solid var(--gcg-color-primary)
 }
 
 .btn-primary::before {
@@ -797,6 +802,7 @@ link:focus,
 .btn-primary:active {
   background: var(--gcg-color-primary) !important;
   color: var(--gcg-color-primary);
+  border: 1px solid var(--gcg-color-primary);
 }
 
 .btn-primary:active::before {
@@ -805,21 +811,22 @@ link:focus,
 
 .btn-primary:hover {
   background: var(--gcg-color-primary);
-  color: var(--gcg-color-primary);
+  color: var(--gcg-color-secondary);
+  border: 1px solid var(--gcg-color-primary);
 }
 
 .btn-primary:not(:disabled):not(.disabled).active,
 .btn-primary:not(:disabled):not(.disabled):active,
 .show > .btn-primary.dropdown-toggle {
-  color: white;
+  color: var(--gcg-color-secondary);
   background-color: var(--gcg-color-primary);
   border-color: var(--gcg-color-primary);
 }
 
 .btn-secondary {
-  background: white;
+  background: var(--gcg-color-secondary);
   color: var(--gcg-color-primary);
-  border: 1px solid white;
+  border: 1px solid var(--gcg-color-secondary);
 }
 
 .btn-secondary::before {
@@ -828,34 +835,14 @@ link:focus,
 
 .btn-secondary:active {
   background: var(--gcg-color-primary);
-  color: white;
-  border: 1px solid white;
+  color: var(--gcg-color-secondary);
+  border: 1px solid var(--gcg-color-secondary);
 }
 
 .btn-secondary:hover {
-  background: white;
-  color: white;
-  border: 1px solid white;
-}
-
-.btn-primary-outline {
-  border: 1px solid var(--gcg-color-primary);
-  color: var(--gcg-color-primary);
-  background: transparent;
-}
-
-.btn-primary-outline::before {
-  background: white;
-}
-
-.btn-primary-outline:hover {
-  background: var(--gcg-color-primary);
-  color: var(--gcg-color-primary);
-}
-
-.btn-primary-outline:active {
-  background: var(--gcg-color-primary);
-  color: white;
+  background: var(--gcg-color-secondary);
+  color: var(--gcg-color-secondary);
+  border: 1px solid var(--gcg-color-secondary);
 }
 
 /* media queries */
@@ -932,6 +919,15 @@ link:focus,
 
   .navbar-expand-xl .navbar-nav .nav-link {
     padding: 20px;
+    color: white !important;
+  }
+
+  .link:focus, .navbar-dark .navbar-nav .nav-link:hover {
+    color: white !important;
+  }
+
+  .nav-item:hover::before {
+    background-color: white;
   }
 
   .navbar .dropdown-menu {
diff --git a/config.yml b/config.yml
index 1cdb6a48..5e23092b 100644
--- a/config.yml
+++ b/config.yml
@@ -60,7 +60,7 @@ params:
       link: https://facebook.com/cantor.news
   preloader:
     enable: true
-    preloader: media/logo_lg_white.webp
+    preloader: media/logo_lg_blue.webp
     loader: media/load.svg
 menu:
   main:
diff --git a/layouts/about/list.html b/layouts/about/list.html
index fbc1a772..fd499132 100644
--- a/layouts/about/list.html
+++ b/layouts/about/list.html
@@ -20,8 +20,8 @@
       {{ range .zahlen }}
       <div class="col-md-4 col-sm-6 mb-4 mb-md-0">
         <div class="text-center">
-          <h2 class="count text-white" data-count="{{ .count }}">0</h2>
-          <h5 class="text-white">{{ .name }}</h5>
+          <h2 class="count text-secondary" data-count="{{ .count }}">0</h2>
+          <h5 class="text-secondary">{{ .name }}</h5>
         </div>
       </div>
       {{ end }}
diff --git a/layouts/index.html b/layouts/index.html
index b3b9f0ae..75624d0b 100644
--- a/layouts/index.html
+++ b/layouts/index.html
@@ -108,7 +108,7 @@
       <h2 class="mb-0 text-nowrap me-3">{{ $data.homepage.blog.title }}</h2>
       <div class="border-top w-100 border-primary d-none d-sm-block"></div>
       <div>
-        <a href="{{ `blog` | relURL }}" class="btn btn-sm btn-primary-outline ms-sm-3 d-none d-sm-block">Alle anzeigen</a>
+        <a href="{{ `blog` | relURL }}" class="btn btn-sm btn-primary ms-sm-3 d-none d-sm-block">Alle anzeigen</a>
       </div>
     </div>
     <div class="row justify-content-center">
@@ -175,7 +175,7 @@
       <h2 class="mb-0 text-nowrap me-3">{{ $data.homepage.ganztagsangebote.title }}</h2>
       <div class="border-top w-100 border-primary d-none d-sm-block"></div>
       <div>
-        <a href="{{ `ganztagsangebote` | relURL }}" class="btn btn-sm btn-primary-outline ms-sm-3 d-none d-sm-block">Alle anzeigen</a>
+        <a href="{{ `ganztagsangebote` | relURL }}" class="btn btn-sm btn-primary ms-sm-3 d-none d-sm-block">Alle anzeigen</a>
       </div>
     </div>
     <div class="row justify-content-center">
@@ -185,7 +185,7 @@
             <div class="card border-primary rounded-0 hover-shadow mb-4">
               <img class="card-img-top rounded-0" src="{{ .image | relURL }}">
               <div class="card-body">
-                <h4 class="card-title text-truncate">{{ .title }}</h4>
+                <h4 class="card-title text-truncate mb-0">{{ .title }}</h4>
               </div>
             </div>
           </div>
@@ -200,8 +200,8 @@
 {{ with $data.homepage.cta }}
 <section class="section bg-primary">
   <div class="container text-center">
-    <h2 class="text-white mb-0">{{ .title | markdownify }}</h2>
-    <h5 class="mb-4 text-white">{{ .subtitle | markdownify }}</h5>
+    <h2 class="text-secondary mb-0">{{ .title | markdownify }}</h2>
+    <h5 class="text-secondary mb-4">{{ .subtitle | markdownify }}</h5>
     {{ if .button.enable }}
     {{ with .button }}
     <a href="{{ .link | absURL }}" class="btn btn-secondary text-uppercase">{{ .label }}</a>
@@ -223,7 +223,7 @@
       <h2 class="mb-0 text-nowrap me-3">{{ $data.homepage.termine.title }}</h2>
       <div class="border-top w-100 border-primary d-none d-sm-block"></div>
       <div>
-        <a href="{{`termine` | relURL }}" class="btn btn-sm btn-primary-outline ms-sm-3 d-none d-sm-block text-nowrap">Alle anzeigen</a>
+        <a href="{{`termine` | relURL }}" class="btn btn-sm btn-primary ms-sm-3 d-none d-sm-block text-nowrap">Alle anzeigen</a>
       </div>
     </div>
     <div class="row justify-content-center px-2">
@@ -246,7 +246,7 @@
     </div>
     <div class="row">
       <div class="col-12 text-center">
-        <a href="{{`termine` | relURL }}" class="btn btn-sm btn-primary-outline d-sm-none d-inline-block">Alle anzeigen</a>
+        <a href="{{`termine` | relURL }}" class="btn btn-sm btn-primary d-sm-none d-inline-block">Alle anzeigen</a>
       </div>
     </div>
   </div>
diff --git a/layouts/partials/termin.html b/layouts/partials/termin.html
index a5284d87..0c2470e1 100644
--- a/layouts/partials/termin.html
+++ b/layouts/partials/termin.html
@@ -1,6 +1,6 @@
 <div class="card hover-shadow border-primary mb-4 p-0">
   <div class="row g-0">
-    <div class="col-md-3 text-center p-4 bg-primary text-white rounded">
+    <div class="col-md-3 text-center p-4 bg-primary text-secondary">
       <div class="h2">{{ time.Format "2" .date}}</div>
       <div>{{ time.Format "Jan 2006" .date}}</div>
       {{ with .enddate }}<br>bis {{ time.Format "2 Jan 2006" . }}{{ end }}
diff --git a/static/admin/previews/page-previews/about-preview.js b/static/admin/previews/page-previews/about-preview.js
index c4ff469d..e5385e3e 100644
--- a/static/admin/previews/page-previews/about-preview.js
+++ b/static/admin/previews/page-previews/about-preview.js
@@ -39,8 +39,8 @@ const AboutPreview = ({ widgetFor, widgetsFor, entry, fields, collection }) => {
                   h(
                     "div",
                     { className: "text-center" },
-                    h("h2", { className: "count text-white" }, element.count),
-                    h("h5", { className: "text-white" }, element.name)
+                    h("h2", { className: "count text-secondary" }, element.count),
+                    h("h5", { className: "text-secondary" }, element.name)
                   )
                 );
               })
diff --git a/static/admin/previews/page-previews/event-preview.js b/static/admin/previews/page-previews/event-preview.js
index c17fd31d..eab98331 100644
--- a/static/admin/previews/page-previews/event-preview.js
+++ b/static/admin/previews/page-previews/event-preview.js
@@ -48,7 +48,7 @@ const EventPreview = ({ widgetsFor, entry }) => {
                     "div",
                     {
                       className:
-                        "col-md-3 text-center p-4 bg-primary text-white rounded",
+                        "col-md-3 text-center p-4 bg-primary text-secondary",
                     },
                     h(
                       "div",