From bc8dd1dda46bdd712e25c5c7fd5b6dce68f166e7 Mon Sep 17 00:00:00 2001
From: "Rudy (zarya)" <git@gigafreak.net>
Date: Sat, 7 Jun 2025 15:40:01 +0200
Subject: [PATCH 1/4] Fix #1870

---
 src/shop/templates/shop_base.html        | 2 +-
 src/static_src/css/theme-slate.css       | 4 ++++
 src/static_src/css/theme-solar.css       | 4 ++++
 src/static_src/css/theme-system-dark.css | 4 ++++
 4 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/src/shop/templates/shop_base.html b/src/shop/templates/shop_base.html
index 7233d2db5..a201b9b88 100644
--- a/src/shop/templates/shop_base.html
+++ b/src/shop/templates/shop_base.html
@@ -8,7 +8,7 @@
 
   <div class="row">
     <div class="col-12">
-      <nav style="--bs-breadcrumb-divider: '';" aria-label="breadcrumb" class="bg-light">
+      <nav style="--bs-breadcrumb-divider: '';" aria-label="breadcrumb" class="bg-secondary-subtle">
         <ol class="breadcrumb">
           <li class="breadcrumb-item"><a href="{% url 'shop:index' %}">Shop</a></li>
           {% if product %}
diff --git a/src/static_src/css/theme-slate.css b/src/static_src/css/theme-slate.css
index 40d43f871..3b72f4165 100644
--- a/src/static_src/css/theme-slate.css
+++ b/src/static_src/css/theme-slate.css
@@ -61,6 +61,10 @@
     --bs-navbar-toggler-border-color: rgba(255, 255, 255, 0.1);
     --bs-btn-close-filter: invert(1) grayscale(100%) brightness(200%);
 
+    .table-secondary {
+        --bs-table-striped-bg: var(--bs-secondary-bg-subtle);
+    }
+
     /* Default state */
     .accordion-button::after {
         background-image: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 16 16' fill='%23fff'%3e%3cpath fill-rule='evenodd' d='M1.646 4.646a.5.5 0 0 1 .708 0L8 10.293l5.646-5.647a.5.5 0 0 1 .708.708l-6 6a.5.5 0 0 1-.708 0l-6-6a.5.5 0 0 1 0-.708z' fill='%23yourColourHere'/%3e%3c/svg%3e");
diff --git a/src/static_src/css/theme-solar.css b/src/static_src/css/theme-solar.css
index 0bb191a18..3fcde28c6 100644
--- a/src/static_src/css/theme-solar.css
+++ b/src/static_src/css/theme-solar.css
@@ -74,6 +74,10 @@
   --bs-navbar-toggler-border-color: rgba(255, 255, 255, 0.1);
   --bs-btn-close-filter: invert(1) grayscale(100%) brightness(200%);
 
+  .table-secondary {
+      --bs-table-striped-bg: var(--bs-secondary-bg-subtle);
+  }
+
   /* Default state */
   .accordion-button::after {
       background-image: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 16 16' fill='%23fff'%3e%3cpath fill-rule='evenodd' d='M1.646 4.646a.5.5 0 0 1 .708 0L8 10.293l5.646-5.647a.5.5 0 0 1 .708.708l-6 6a.5.5 0 0 1-.708 0l-6-6a.5.5 0 0 1 0-.708z' fill='%23yourColourHere'/%3e%3c/svg%3e");
diff --git a/src/static_src/css/theme-system-dark.css b/src/static_src/css/theme-system-dark.css
index 78b45aec3..d0cc87cd4 100644
--- a/src/static_src/css/theme-system-dark.css
+++ b/src/static_src/css/theme-system-dark.css
@@ -63,6 +63,10 @@
         --bs-navbar-toggler-border-color: rgba(255, 255, 255, 0.1);
         --bs-btn-close-filter: invert(1) grayscale(100%) brightness(200%);
 
+        .table-secondary {
+            --bs-table-striped-bg: var(--bs-secondary-bg-subtle);
+        }
+
         /* Default state */
         .accordion-button::after {
             background-image: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 16 16' fill='%23fff'%3e%3cpath fill-rule='evenodd' d='M1.646 4.646a.5.5 0 0 1 .708 0L8 10.293l5.646-5.647a.5.5 0 0 1 .708.708l-6 6a.5.5 0 0 1-.708 0l-6-6a.5.5 0 0 1 0-.708z' fill='%23yourColourHere'/%3e%3c/svg%3e");

From 5238ba5b8ebc5aed42e254c909ddc63655b79569 Mon Sep 17 00:00:00 2001
From: "Rudy (zarya)" <git@gigafreak.net>
Date: Sat, 7 Jun 2025 16:20:56 +0200
Subject: [PATCH 2/4] Much better

---
 src/shop/templates/shop_base.html        | 2 +-
 src/static_src/css/theme-slate.css       | 3 ++-
 src/static_src/css/theme-solar.css       | 3 ++-
 src/static_src/css/theme-system-dark.css | 3 ++-
 4 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/shop/templates/shop_base.html b/src/shop/templates/shop_base.html
index a201b9b88..0d82d7251 100644
--- a/src/shop/templates/shop_base.html
+++ b/src/shop/templates/shop_base.html
@@ -8,7 +8,7 @@
 
   <div class="row">
     <div class="col-12">
-      <nav style="--bs-breadcrumb-divider: '';" aria-label="breadcrumb" class="bg-secondary-subtle">
+      <nav aria-label="breadcrumb" class="bg-dark-subtle text-secondary">
         <ol class="breadcrumb">
           <li class="breadcrumb-item"><a href="{% url 'shop:index' %}">Shop</a></li>
           {% if product %}
diff --git a/src/static_src/css/theme-slate.css b/src/static_src/css/theme-slate.css
index 3b72f4165..a388a08f0 100644
--- a/src/static_src/css/theme-slate.css
+++ b/src/static_src/css/theme-slate.css
@@ -62,7 +62,8 @@
     --bs-btn-close-filter: invert(1) grayscale(100%) brightness(200%);
 
     .table-secondary {
-        --bs-table-striped-bg: var(--bs-secondary-bg-subtle);
+        --bs-table-striped-bg: rgba(var(--bs-body-bg-rgb), 0.9);
+        --bs-table-hover-bg: rgba(var(--bs-body-bg-rgb), 0.8);
     }
 
     /* Default state */
diff --git a/src/static_src/css/theme-solar.css b/src/static_src/css/theme-solar.css
index 3fcde28c6..d45d42c74 100644
--- a/src/static_src/css/theme-solar.css
+++ b/src/static_src/css/theme-solar.css
@@ -75,7 +75,8 @@
   --bs-btn-close-filter: invert(1) grayscale(100%) brightness(200%);
 
   .table-secondary {
-      --bs-table-striped-bg: var(--bs-secondary-bg-subtle);
+      --bs-table-striped-bg: rgba(var(--bs-body-bg-rgb), 0.9); 
+      --bs-table-hover-bg: rgba(var(--bs-body-bg-rgb), 0.8);
   }
 
   /* Default state */
diff --git a/src/static_src/css/theme-system-dark.css b/src/static_src/css/theme-system-dark.css
index d0cc87cd4..93757336d 100644
--- a/src/static_src/css/theme-system-dark.css
+++ b/src/static_src/css/theme-system-dark.css
@@ -64,7 +64,8 @@
         --bs-btn-close-filter: invert(1) grayscale(100%) brightness(200%);
 
         .table-secondary {
-            --bs-table-striped-bg: var(--bs-secondary-bg-subtle);
+            --bs-table-striped-bg: rgba(var(--bs-body-bg-rgb), 0.9);
+            --bs-table-hover-bg: rgba(var(--bs-body-bg-rgb), 0.8);
         }
 
         /* Default state */

From 0a44431cc4fea925a5848974a4c721216763814b Mon Sep 17 00:00:00 2001
From: "Rudy (zarya)" <git@gigafreak.net>
Date: Sat, 7 Jun 2025 16:43:56 +0200
Subject: [PATCH 3/4] Fix table headers in schedule

---
 src/static_src/css/theme-slate.css       | 2 ++
 src/static_src/css/theme-solar.css       | 2 ++
 src/static_src/css/theme-system-dark.css | 2 ++
 3 files changed, 6 insertions(+)

diff --git a/src/static_src/css/theme-slate.css b/src/static_src/css/theme-slate.css
index a388a08f0..58e48e8fe 100644
--- a/src/static_src/css/theme-slate.css
+++ b/src/static_src/css/theme-slate.css
@@ -64,6 +64,8 @@
     .table-secondary {
         --bs-table-striped-bg: rgba(var(--bs-body-bg-rgb), 0.9);
         --bs-table-hover-bg: rgba(var(--bs-body-bg-rgb), 0.8);
+        --bs-table-bg: var(--bs-gray-800);
+        --bs-table-color: var(--bs-body-color);
     }
 
     /* Default state */
diff --git a/src/static_src/css/theme-solar.css b/src/static_src/css/theme-solar.css
index d45d42c74..3bef1084d 100644
--- a/src/static_src/css/theme-solar.css
+++ b/src/static_src/css/theme-solar.css
@@ -77,6 +77,8 @@
   .table-secondary {
       --bs-table-striped-bg: rgba(var(--bs-body-bg-rgb), 0.9); 
       --bs-table-hover-bg: rgba(var(--bs-body-bg-rgb), 0.8);
+      --bs-table-bg: rgba(var(--bs-secondary-bg-rgb), 0.8); 
+      --bs-table-color: var(--bs-body-color);
   }
 
   /* Default state */
diff --git a/src/static_src/css/theme-system-dark.css b/src/static_src/css/theme-system-dark.css
index 93757336d..a680183e9 100644
--- a/src/static_src/css/theme-system-dark.css
+++ b/src/static_src/css/theme-system-dark.css
@@ -66,6 +66,8 @@
         .table-secondary {
             --bs-table-striped-bg: rgba(var(--bs-body-bg-rgb), 0.9);
             --bs-table-hover-bg: rgba(var(--bs-body-bg-rgb), 0.8);
+            --bs-table-bg: var(--bs-gray-800);
+            --bs-table-color: var(--bs-body-color);
         }
 
         /* Default state */

From 71d56ea8b25126ab611143f6b639b12b044d199d Mon Sep 17 00:00:00 2001
From: "Rudy (zarya)" <git@gigafreak.net>
Date: Sat, 7 Jun 2025 17:09:54 +0200
Subject: [PATCH 4/4] Much better

---
 src/static_src/css/theme-slate.css       | 6 +++---
 src/static_src/css/theme-solar.css       | 4 ++--
 src/static_src/css/theme-system-dark.css | 6 +++---
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/static_src/css/theme-slate.css b/src/static_src/css/theme-slate.css
index 58e48e8fe..767d94613 100644
--- a/src/static_src/css/theme-slate.css
+++ b/src/static_src/css/theme-slate.css
@@ -62,9 +62,9 @@
     --bs-btn-close-filter: invert(1) grayscale(100%) brightness(200%);
 
     .table-secondary {
-        --bs-table-striped-bg: rgba(var(--bs-body-bg-rgb), 0.9);
-        --bs-table-hover-bg: rgba(var(--bs-body-bg-rgb), 0.8);
-        --bs-table-bg: var(--bs-gray-800);
+        --bs-table-striped-bg: rgba(var(--bs-secondary-bg-rgb), 0.9);
+        --bs-table-hover-bg: rgba(var(--bs-secondary-color-rgb), 0.2);
+        --bs-table-bg: rgba(var(--bs-secondary-bg-rgb), 0.8);
         --bs-table-color: var(--bs-body-color);
     }
 
diff --git a/src/static_src/css/theme-solar.css b/src/static_src/css/theme-solar.css
index 3bef1084d..34b413c34 100644
--- a/src/static_src/css/theme-solar.css
+++ b/src/static_src/css/theme-solar.css
@@ -75,8 +75,8 @@
   --bs-btn-close-filter: invert(1) grayscale(100%) brightness(200%);
 
   .table-secondary {
-      --bs-table-striped-bg: rgba(var(--bs-body-bg-rgb), 0.9); 
-      --bs-table-hover-bg: rgba(var(--bs-body-bg-rgb), 0.8);
+      --bs-table-striped-bg: rgba(var(--bs-secondary-bg-rgb), 0.9); 
+      --bs-table-hover-bg: rgba(var(--bs-secondary-color-rgb), 0.2);
       --bs-table-bg: rgba(var(--bs-secondary-bg-rgb), 0.8); 
       --bs-table-color: var(--bs-body-color);
   }
diff --git a/src/static_src/css/theme-system-dark.css b/src/static_src/css/theme-system-dark.css
index a680183e9..c5e74df44 100644
--- a/src/static_src/css/theme-system-dark.css
+++ b/src/static_src/css/theme-system-dark.css
@@ -64,9 +64,9 @@
         --bs-btn-close-filter: invert(1) grayscale(100%) brightness(200%);
 
         .table-secondary {
-            --bs-table-striped-bg: rgba(var(--bs-body-bg-rgb), 0.9);
-            --bs-table-hover-bg: rgba(var(--bs-body-bg-rgb), 0.8);
-            --bs-table-bg: var(--bs-gray-800);
+            --bs-table-striped-bg: rgba(var(--bs-secondary-bg-rgb), 0.9);
+            --bs-table-hover-bg: rgba(var(--bs-secondary-color-rgb), 0.2);
+            --bs-table-bg: rgba(var(--bs-secondary-bg-rgb), 0.8);
             --bs-table-color: var(--bs-body-color);
         }