From b78c307f80fb87eb5bf87ce92bde608c44094bdf Mon Sep 17 00:00:00 2001
From: Peter Goodhall <peter@magicbug.co.uk>
Date: Fri, 23 Feb 2024 15:29:37 +0000
Subject: [PATCH] [Dashboard] Upcoming DXPed - Improved CSS

Upcoming DXPed - Improved CSS to handle dark themes better
---
 application/views/components/upcoming_dxccs.php | 10 +++++-----
 assets/css/cyborg/overrides.css                 | 13 +++++++++++++
 assets/css/cyborg_wide/overrides.css            | 13 +++++++++++++
 assets/css/darkly/overrides.css                 | 11 +++++++++++
 assets/css/darkly_wide/overrides.css            | 13 +++++++++++++
 assets/css/general.css                          | 11 +++++++++++
 assets/css/superhero/overrides.css              | 15 +++++++++++++++
 assets/css/superhero_wide/overrides.css         | 15 +++++++++++++++
 8 files changed, 96 insertions(+), 5 deletions(-)

diff --git a/application/views/components/upcoming_dxccs.php b/application/views/components/upcoming_dxccs.php
index d585e4ae..6ed72f59 100644
--- a/application/views/components/upcoming_dxccs.php
+++ b/application/views/components/upcoming_dxccs.php
@@ -1,15 +1,15 @@
-<table class="table table-striped border-top">
+<table id="upcoming_dxccs_component" class="table table-striped border-top">
     <tr class="titles">
         <td colspan="3"><i class="fas fa-chart-bar"></i> DXPeditions (This Week)</td>
     </tr>
 
     <?php
     foreach ($thisWeekRecords as $record) {
-        $color = $record['workedBefore'] == 1 ? '#ddffdd' : '#ffdddd';
+        $name = $record['workedBefore'] == 1 ? 'worked_before' : 'not_worked_before';
         echo '<tr>';
-        echo '<td style="background-color: ' . $color . ';" width="33%">' . $record['daysLeft'] . '</td>'; // Date
-        echo '<td style="background-color: ' . $color . ';" width="33%">' . '<a href="#" data-bs-toggle="tooltip" data-bs-title="'.$record['6'].'">'.$record['callsign'] . '</a>'. '</td>'; // Callsign
-        echo '<td style="background-color: ' . $color . ';" width="33%">' . $record['2'] . '</td>'; // Country
+        echo '<td id="' . $name . '">' . $record['daysLeft'] . '</td>'; // Date
+        echo '<td id="' . $name . '">' . '<a href="#" data-bs-toggle="tooltip" data-bs-title="'.$record['6'].'">'.$record['callsign'] . '</a>'. '</td>'; // Callsign
+        echo '<td id="' . $name . '">' . $record['2'] . '</td>'; // Country
         echo '</tr>';
     }
     ?>
diff --git a/assets/css/cyborg/overrides.css b/assets/css/cyborg/overrides.css
index 724e3a93..ab11369f 100644
--- a/assets/css/cyborg/overrides.css
+++ b/assets/css/cyborg/overrides.css
@@ -191,4 +191,17 @@ path.grid-worked {
 }
 .accordion-button.collapsed {
 	border-bottom: 1px solid var(--bs-body-bg);
+}
+
+/* CSS for Upcoming DXCC Component */
+#upcoming_dxccs_component #worked_before {
+	background-color: #ddffdd;
+	width: 33%;
+	color: #000;
+}
+
+#upcoming_dxccs_component #not_worked_before {
+	background-color: #ffdddd;
+	width: 33%;
+	color: #000;
 }
\ No newline at end of file
diff --git a/assets/css/cyborg_wide/overrides.css b/assets/css/cyborg_wide/overrides.css
index b858a186..558360d8 100644
--- a/assets/css/cyborg_wide/overrides.css
+++ b/assets/css/cyborg_wide/overrides.css
@@ -246,4 +246,17 @@ path.grid-worked {
 }
 .accordion-button.collapsed {
 	border-bottom: 1px solid var(--bs-body-bg);
+}
+
+/* CSS for Upcoming DXCC Component */
+#upcoming_dxccs_component #worked_before {
+	background-color: #ddffdd;
+	width: 33%;
+	color: #000;
+}
+
+#upcoming_dxccs_component #not_worked_before {
+	background-color: #ffdddd;
+	width: 33%;
+	color: #000;
 }
\ No newline at end of file
diff --git a/assets/css/darkly/overrides.css b/assets/css/darkly/overrides.css
index 94e102fb..7deae254 100644
--- a/assets/css/darkly/overrides.css
+++ b/assets/css/darkly/overrides.css
@@ -204,4 +204,15 @@ div.alert-danger {
 	border-bottom:1px solid var(--bs-body-bg);
 }
 
+/* CSS for Upcoming DXCC Component */
+#upcoming_dxccs_component #worked_before {
+	background-color: #ddffdd;
+	width: 33%;
+	color: #000;
+}
 
+#upcoming_dxccs_component #not_worked_before {
+	background-color: #ffdddd;
+	width: 33%;
+	color: #000;
+}
\ No newline at end of file
diff --git a/assets/css/darkly_wide/overrides.css b/assets/css/darkly_wide/overrides.css
index 99b49e03..857a0aae 100644
--- a/assets/css/darkly_wide/overrides.css
+++ b/assets/css/darkly_wide/overrides.css
@@ -258,4 +258,17 @@ div.alert-danger {
 }
 .accordion-button.collapsed {
 	border-bottom:1px solid var(--bs-body-bg);
+}
+
+/* CSS for Upcoming DXCC Component */
+#upcoming_dxccs_component #worked_before {
+	background-color: #ddffdd;
+	width: 33%;
+	color: #000;
+}
+
+#upcoming_dxccs_component #not_worked_before {
+	background-color: #ffdddd;
+	width: 33%;
+	color: #000;
 }
\ No newline at end of file
diff --git a/assets/css/general.css b/assets/css/general.css
index 4f17f87b..0207fd68 100644
--- a/assets/css/general.css
+++ b/assets/css/general.css
@@ -783,3 +783,14 @@ label {
 	background-color: rgb(254 243 199) !important;
 	--bs-badge-color: rgb(217 119 6) !important;
 }
+
+/* CSS for Upcoming DXCC Component */
+#upcoming_dxccs_component #worked_before {
+	background-color: #ddffdd;
+	width: 33%;
+}
+
+#upcoming_dxccs_component #not_worked_before {
+	background-color: #ffdddd;
+	width: 33%;
+}
\ No newline at end of file
diff --git a/assets/css/superhero/overrides.css b/assets/css/superhero/overrides.css
index 0e75c70a..ae46b52b 100644
--- a/assets/css/superhero/overrides.css
+++ b/assets/css/superhero/overrides.css
@@ -194,4 +194,19 @@ div.alert-danger {
 }
 .accordion-body {
 	border: 1px solid #4e5e6c;
+}
+
+/* CSS for Upcoming DXCC Component */
+#upcoming_dxccs_component #worked_before {
+	background-color: #ddffdd;
+	width: 33%;
+	color: #000;
+	box-shadow: none !important;
+}
+
+#upcoming_dxccs_component #not_worked_before {
+	background-color: #ffdddd !important;
+	width: 33%;
+	color: #000;
+	box-shadow: none !important;
 }
\ No newline at end of file
diff --git a/assets/css/superhero_wide/overrides.css b/assets/css/superhero_wide/overrides.css
index 8184432a..da0f9f8b 100644
--- a/assets/css/superhero_wide/overrides.css
+++ b/assets/css/superhero_wide/overrides.css
@@ -248,4 +248,19 @@ div.alert-danger {
 }
 .accordion-body {
 	border: 1px solid #4e5e6c;
+}
+
+/* CSS for Upcoming DXCC Component */
+#upcoming_dxccs_component #worked_before {
+	background-color: #ddffdd;
+	width: 33%;
+	color: #000;
+	box-shadow: none !important;
+}
+
+#upcoming_dxccs_component #not_worked_before {
+	background-color: #ffdddd !important;
+	width: 33%;
+	color: #000;
+	box-shadow: none !important;
 }
\ No newline at end of file