fix: Use correct logo in dark mode menubar (#6016)

Also use the "nor" variant elsewhere the logo is small.
ietf-tools · Jul 22, 2023 · 97c7dd4 · 97c7dd4
1 parent 4ec22da
commit 97c7dd4
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 5 deletions.
diff --git a/ietf/templates/base.html b/ietf/templates/base.html
@@ -38,8 +38,7 @@
         <nav class="navbar navbar-expand-lg fixed-top {% if server_mode and server_mode != "production" %}bg-danger-subtle{% else %}bg-secondary{% endif %}">
             <div class="container-fluid">
                 <a class="navbar-brand" href="/">
-                    <img alt="IETF Logo" class="me-2"
-                        src="{% static 'ietf/images/ietf-logo-nor-white.svg' %}">
+                    {% include "logo.html" with org="ietf" classes="me-2" nor=True only %}
                     Datatracker
                     {% if server_mode and server_mode != "production" %}
                         <span class="text-danger">&delta;</span>

diff --git a/ietf/templates/doc/document_info.html b/ietf/templates/doc/document_info.html
@@ -238,7 +238,7 @@
                 {% endif %}
                 {% if document_html %}
                     {% if doc.stream.name|lower in 'iab,ietf,irtf' %}
-                        {% include "logo.html" with org=doc.stream.name|lower classes="w-25 mt-1" title=stream_desc only %}
+                        {% include "logo.html" with org=doc.stream.name|lower classes="w-25 mt-1" title=stream_desc nor=True only %}
                     {% else %}
                         {{ stream_desc }}
                     {% endif %}

diff --git a/ietf/templates/logo.html b/ietf/templates/logo.html
@@ -7,7 +7,11 @@
          {% if org == "iab" %}
              srcset="{% static 'ietf/images/iab-logo-white.svg' %}"
          {% elif org == "ietf" %}
-             srcset="{% static 'ietf/images/ietf-logo-white.svg' %}"
+            {% if nor %}
+                 srcset="{% static 'ietf/images/ietf-logo-nor-white.svg' %}"
+            {% else %}
+                 srcset="{% static 'ietf/images/ietf-logo-white.svg' %}"
+            {% endif %}
          {% elif org == "irtf" %}
             srcset="{% static 'ietf/images/irtf-logo-white.svg' %}"
          {% endif %}
@@ -18,7 +22,11 @@
          {% if org == "iab" %}
              src="{% static 'ietf/images/iab-logo.svg' %}"
          {% elif org == "ietf" %}
-             src="{% static 'ietf/images/ietf-logo.svg' %}"
+            {% if nor %}
+                 src="{% static 'ietf/images/ietf-logo-nor.svg' %}"
+            {% else %}
+                 src="{% static 'ietf/images/ietf-logo.svg' %}"
+            {% endif %}
          {% elif org == "irtf" %}
              src="{% static 'ietf/images/irtf-logo.svg' %}"
          {% endif %}