From: Tom Hughes <tom@compton.nu>
Date: Sun, 14 Apr 2024 18:10:38 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/pull/4700'
X-Git-Tag: live~160
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/28a39c645fd3addaeb8d00921b40308588934865?hp=258964f5fa27b7dafe17850f91ce3c22862314d0

Merge remote-tracking branch 'upstream/pull/4700'
---

diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss
index fd12d7e6b..6c1a65e7b 100644
--- a/app/assets/stylesheets/common.scss
+++ b/app/assets/stylesheets/common.scss
@@ -66,6 +66,21 @@ time[title] {
   color: $blue;
 }
 
+/* Bootstrap contextual table classes overrides in dark mode */
+
+@include color-mode(dark) {
+  .table-primary {
+    --bs-table-bg: rgb(var(--bs-primary-rgb), .25);
+  }
+  .table-secondary {
+    --bs-table-bg: rgb(var(--bs-secondary-rgb), .25);
+  }
+  .table-primary, .table-secondary {
+    --bs-table-color: initial;
+    border-color: inherit;
+  }
+}
+
 /* Rules for the header */
 
 #menu-icon {
diff --git a/app/views/browse/_tag.html.erb b/app/views/browse/_tag.html.erb
index 578dc8b59..f2e34d879 100644
--- a/app/views/browse/_tag.html.erb
+++ b/app/views/browse/_tag.html.erb
@@ -1,4 +1,4 @@
 <tr>
-  <th class='py-1 border-secondary-subtle table-light fw-normal' dir='auto'><%= format_key(tag[0]) %></th>
+  <th class='py-1 border-secondary-subtle table-secondary fw-normal' dir='auto'><%= format_key(tag[0]) %></th>
   <td class='py-1 border-secondary-subtle border-start' dir='auto'><%= format_value(tag[0], tag[1]) %></td>
 </tr>
diff --git a/app/views/notes/index.html.erb b/app/views/notes/index.html.erb
index d93978480..8622bbf29 100644
--- a/app/views/notes/index.html.erb
+++ b/app/views/notes/index.html.erb
@@ -3,7 +3,7 @@
   <p><%= t ".subheading_html",
            :user => link_to(@user.display_name, @user),
            :submitted => tag.span(t(".subheading_submitted"), :class => "px-2 py-1 bg-primary bg-opacity-25"),
-           :commented => tag.span(t(".subheading_commented"), :class => "px-2 py-1 bg-white") %></p>
+           :commented => tag.span(t(".subheading_commented"), :class => "px-2 py-1 bg-body") %></p>
 <% end %>
 
 <% if @notes.empty? %>