From 54c7951f7b68db4ed4389fa469d2716ec7c26bcb Mon Sep 17 00:00:00 2001
From: Lars Eggert <lars@eggert.org>
Date: Thu, 20 Apr 2023 00:01:55 +0300
Subject: [PATCH] Fix some colors

---
 ietf/static/css/document_html_txt.scss | 4 ++--
 ietf/static/js/ietf.js                 | 4 ++--
 ietf/templates/base.html               | 6 +++---
 ietf/templates/doc/document_html.html  | 8 ++++----
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/ietf/static/css/document_html_txt.scss b/ietf/static/css/document_html_txt.scss
index 278a340db..de6fd36b4 100644
--- a/ietf/static/css/document_html_txt.scss
+++ b/ietf/static/css/document_html_txt.scss
@@ -375,7 +375,7 @@ thead, tfoot {
   border-bottom-style: double;
 }
 td, th {
-  border: 1px solid black;
+  border: 1px solid inherit;
   // padding: var(--half-line) 1ch;
   padding-top: var(--half-line);
   padding-right: 1ch;
@@ -394,7 +394,7 @@ td, th {
 
 /* Links */
 a.selfRef, a.pilcrow, .iref + a.internal {
-  color: black;
+  color: inherit;
   text-decoration: none;
 }
 a.relref, a.xref {
diff --git a/ietf/static/js/ietf.js b/ietf/static/js/ietf.js
index dfd050b75..d66213bcf 100644
--- a/ietf/static/js/ietf.js
+++ b/ietf/static/js/ietf.js
@@ -183,8 +183,8 @@ $(function () {
                 .attr("tabindex", 0)
                 .after($(`
                  <div class="col-xl-2 ps-0 small">
-                     <div id="righthand-panel" class="position-fixed col-xl-2 bg-light d-flex flex-column justify-content-between align-items-start">
-                         <nav id="righthand-nav" class="navbar navbar-light w-100 overflow-auto align-items-start flex-fill"></nav>
+                     <div id="righthand-panel" class="position-fixed col-xl-2 bg-light-subtle d-flex flex-column justify-content-between align-items-start">
+                         <nav id="righthand-nav" class="navbar w-100 overflow-auto align-items-start flex-fill"></nav>
                      </div>
                  </div>
                  `));
diff --git a/ietf/templates/base.html b/ietf/templates/base.html
index 7e06e6cae..39fdb97c4 100644
--- a/ietf/templates/base.html
+++ b/ietf/templates/base.html
@@ -33,7 +33,7 @@
           data-group-menu-data-url="{% url 'ietf.group.views.group_menu_data' %}">
         {% analytical_body_top %}
         <a class="visually-hidden visually-hidden-focusable" href="#content">Skip to main content</a>
-        <nav class="navbar navbar-expand-lg {% if server_mode and server_mode != "production" %} navbar-light bg-warning {% else %} navbar-dark bg-secondary {% endif %}  {% if navbar_mode %} {{ navbar_mode }} {% else %} fixed-top {% endif %}">
+        <nav class="navbar navbar-expand-lg {% if server_mode and server_mode != "production" %} bg-warning {% else %} bg-secondary {% endif %}  {% if navbar_mode %} {{ navbar_mode }} {% else %} fixed-top {% endif %}">
             <div class="container-fluid">
                 <a class="navbar-brand" href="/">
                     <img alt="IETF Logo" class="me-2"
@@ -87,7 +87,7 @@
         <div class="pt-3 container-fluid">
             <div class="row">
                 {% if request.COOKIES.left_menu == "on" and not hide_menu %}
-                    <div class="d-none d-md-block bg-light py-3 leftmenu small">
+                    <div class="d-none d-md-block bg-light-subtle py-3 leftmenu small">
                         <ul class="nav nav-pills flex-column">
                             {% include "base/menu.html" with flavor="left" %}
                         </ul>
@@ -115,7 +115,7 @@
             </div>
         </div>
         {% block footer %}
-            <footer class="col-md-12 col-sm-12 bg-white text-center position-sticky">
+            <footer class="col-md-12 col-sm-12 bg-light-subtle text-center position-sticky">
                 <hr class="mx-3">
                 <a href="https://www.ietf.org/" class="p-3">IETF</a>
                 <a href="https://www.ietf.org/iesg/" class="p-3">IESG</a>
diff --git a/ietf/templates/doc/document_html.html b/ietf/templates/doc/document_html.html
index e5cc45719..57210b4a5 100644
--- a/ietf/templates/doc/document_html.html
+++ b/ietf/templates/doc/document_html.html
@@ -5,7 +5,7 @@
 {% load static %}
 {% load ietf_filters textfilters %}
 {% origin %}
-<html lang="en">
+<html data-bs-theme="auto" lang="en">
     <head>
         {% analytical_head_top %}
         <meta charset="utf-8">
@@ -61,7 +61,7 @@
                 title="Show metadata sidebar">
         <i class="bi bi-layout-sidebar-reverse"></i>
         </button>
-        <nav class="navbar navbar-light bg-light px-1 fixed-top d-print-none d-md-none">
+        <nav class="navbar bg-light-subtle px-1 fixed-top d-print-none d-md-none">
             <a class="nav-link ps-1"
                href="{% url 'ietf.doc.views_doc.document_main' name=doc.canonical_name %}">
                 {% if not snapshot and doc.get_state_slug == "rfc" %}
@@ -88,7 +88,7 @@
                 <span class="navbar-toggler-icon small"></span>
             </button>
             <div class="navbar-nav navbar-nav-scroll overscroll-none collapse pt-1" id="docinfo-collapse">
-                <div class="bg-light p-0">
+                <div class="bg-light-subtle p-0">
                     <table class="table table-sm table-borderless small">
                         <tbody class="meta align-top">
                             <tr>
@@ -136,7 +136,7 @@
                     </div>
                 {% endif %}
             </div>
-            <div class="d-print-none col-md-3 bg-light collapse{% if request.COOKIES.sidebar != 'off'%} show{% endif %}" id="sidebar">
+            <div class="d-print-none col-md-3 bg-light-subtle collapse{% if request.COOKIES.sidebar != 'off'%} show{% endif %}" id="sidebar">
                 <div class="position-fixed border-start sidebar overflow-scroll overscroll-none no-scrollbar">
                     <button class="btn btn-outline-secondary float-end m-2"
                             type="button"