[tor-commits] [donate-static/staging] Make navbar black

Tue Oct 20 13:20:57 UTC 2020

commit 71e5f6e7b9764d0ab585c37a0f148b52f358a4da
Author: hiro <hiro at torproject.org>
Date:   Tue Oct 20 15:20:44 2020 +0200

    Make navbar black
---
 databags/menu_footer.ini  | 4 ++--
 templates/meta.html       | 2 +-
 templates/navbar-min.html | 5 ++++-
 templates/navbar.html     | 5 ++++-
 4 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/databags/menu_footer.ini b/databags/menu_footer.ini
index 548f0773..4139cf39 100644
--- a/databags/menu_footer.ini
+++ b/databags/menu_footer.ini
@@ -1,7 +1,7 @@
 [donor-faq]
-path = https://donate.torproject.org/donor-faq
+path = donor-faq
 label = Donor FAQ
 
 [privacy-policy]
-path = https://donate.torproject.org/privacy-policy
+path = privacy-policy
 label = Donor Privacy Policy
diff --git a/templates/meta.html b/templates/meta.html
index 17a9652f..478f22db 100644
--- a/templates/meta.html
+++ b/templates/meta.html
@@ -20,5 +20,5 @@
 <title>{{ _("Tor Project") }} | {% block title %}{{ this.title }}{% endblock %}</title>
 <body class="no-gutters">
   <header>
-    {% include 'navbar-min.html' %}
+    {% include 'navbar.html' %}
   </header>
diff --git a/templates/navbar-min.html b/templates/navbar-min.html
index 51e0bc3b..0c75eea6 100644
--- a/templates/navbar-min.html
+++ b/templates/navbar-min.html
@@ -1,4 +1,7 @@
-{% if not this.color %}
+{% if this.header_color %}
+<div class="container-fluid bg-{{ this.header_color }}">
+  <nav class="navbar no-background navbar-expand-lg navbar-dark bg-{{ this.header_color }} p-2">
+{% elif not this.color %}
 <div class="container-fluid bg-primary">
   <nav class="navbar no-background navbar-expand-lg navbar-dark bg-primary p-2">
 {% elif this.color == 'primary' %}
diff --git a/templates/navbar.html b/templates/navbar.html
index 239ebbc7..a8f40c42 100644
--- a/templates/navbar.html
+++ b/templates/navbar.html
@@ -1,4 +1,7 @@
-{% if not this.color %}
+{% if this.header_color %}
+<div class="container-fluid bg-{{ this.header_color }}">
+  <nav class="navbar no-background navbar-expand-lg navbar-dark bg-{{ this.header_color }} p-2">
+{% elif not this.color %}
 <div class="container-fluid bg-primary">
   <nav class="navbar no-background navbar-expand-lg navbar-dark bg-primary p-4">
 {% elif this.color == 'primary' %}

