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

diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss
index 885f107dc54afbe10e247f0de4d2694d82b987b7..ec5b22396ccd87636e359ad23b4bfc4b5cb5d559 100644 (file)
--- a/app/assets/stylesheets/common.scss
+++ b/app/assets/stylesheets/common.scss
@@ -82,6 +82,18 @@ time[title] {
   100% { opacity: 1 }
 }
 
+/* Bootstrap close button overrides for nested light/dark themes */
+
+[data-bs-theme="dark"],
+[data-bs-theme] [data-bs-theme="dark"] {
+  --bs-btn-close-filter: invert(1) grayscale(100%) brightness(200%);
+}
+
+[data-bs-theme="light"],
+[data-bs-theme] [data-bs-theme="light"] {
+  --bs-btn-close-filter: none;
+}
+
 /* Rules for the header */
 
 #menu-icon {