From b5b7fc99576eef59bced4e5c46bc665711a9919c Mon Sep 17 00:00:00 2001
From: Aman Agrawal <amanagr@zulip.com>
Date: Sat, 28 Oct 2023 13:23:58 +0000
Subject: [PATCH] billing: Use navbar used in login/help pages.

---
 templates/corporate/billing.html  | 11 +----------
 templates/corporate/upgrade.html  |  2 --
 templates/zerver/billing_nav.html |  9 ---------
 tools/linter_lib/custom_check.py  |  1 -
 web/styles/portico/billing.css    | 16 ++++------------
 5 files changed, 5 insertions(+), 34 deletions(-)
 delete mode 100644 templates/zerver/billing_nav.html

diff --git a/templates/corporate/billing.html b/templates/corporate/billing.html
index ac29e09db5..7d9bfffa61 100644
--- a/templates/corporate/billing.html
+++ b/templates/corporate/billing.html
@@ -5,19 +5,10 @@
 <title>{{ _("Billing") }} | Zulip</title>
 {% endblock %}
 
-{% block customhead %}
-<meta name="viewport" content="width=device-width, initial-scale=1.0" />
-{% endblock %}
-
-{% block content %}
+{% block portico_content %}
 
 <div class="app portico-page">
-
-    {% include 'zerver/billing_nav.html' %}
-
     <div class="billing-upgrade-page">
-        <div class="hero small-hero"></div>
-
         <div class="page-content">
             <div class="main">
                 <div class="alert alert-danger" id="error-message-box"></div>
diff --git a/templates/corporate/upgrade.html b/templates/corporate/upgrade.html
index 46ef7fe736..0853cdfbe4 100644
--- a/templates/corporate/upgrade.html
+++ b/templates/corporate/upgrade.html
@@ -13,8 +13,6 @@
 
 <div class="app portico-page">
 
-    {% include 'zerver/billing_nav.html' %}
-
     <div class="billing-upgrade-page new-style">
         <div class="hero small-hero"></div>
 
diff --git a/templates/zerver/billing_nav.html b/templates/zerver/billing_nav.html
deleted file mode 100644
index 0b80206e4c..0000000000
--- a/templates/zerver/billing_nav.html
+++ /dev/null
@@ -1,9 +0,0 @@
-<nav class="portico-header">
-    <div class="content">
-        <a class="brand logo" href="{{ root_domain_url }}">
-            <svg role="img" aria-label="{{ _('Zulip') }}" xmlns="http://www.w3.org/2000/svg" viewBox="68.96 55.62 1742.12 450.43" height="25">
-                <path fill="hsl(0, 0%, 100%)" d="M473.09 122.97c0 22.69-10.19 42.85-25.72 55.08L296.61 312.69c-2.8 2.4-6.44-1.47-4.42-4.7l55.3-110.72c1.55-3.1-.46-6.91-3.64-6.91H129.36c-33.22 0-60.4-30.32-60.4-67.37 0-37.06 27.18-67.37 60.4-67.37h283.33c33.22-.02 60.4 30.3 60.4 67.35zM129.36 506.05h283.33c33.22 0 60.4-30.32 60.4-67.37 0-37.06-27.18-67.37-60.4-67.37H198.2c-3.18 0-5.19-3.81-3.64-6.91l55.3-110.72c2.02-3.23-1.62-7.1-4.42-4.7L94.68 383.6c-15.53 12.22-25.72 32.39-25.72 55.08 0 37.05 27.18 67.37 60.4 67.37zm522.5-124.15l124.78-179.6v-1.56H663.52v-48.98h190.09v34.21L731.55 363.24v1.56h124.01v48.98h-203.7V381.9zm338.98-230.14V302.6c0 45.09 17.1 68.03 47.43 68.03 31.1 0 48.2-21.77 48.2-68.03V151.76h59.09V298.7c0 80.86-40.82 119.34-109.24 119.34-66.09 0-104.96-36.54-104.96-120.12V151.76h59.48zm244.91 0h59.48v212.25h104.18v49.76h-163.66V151.76zm297 0v262.01h-59.48V151.76h59.48zm90.18 3.5c18.27-3.11 43.93-5.44 80.08-5.44 36.54 0 62.59 7 80.08 20.99 16.72 13.22 27.99 34.99 27.99 60.64 0 25.66-8.55 47.43-24.1 62.2-20.21 19.05-50.15 27.6-85.13 27.6-7.77 0-14.77-.39-20.21-1.17v93.69h-58.7V155.26zm58.7 118.96c5.05 1.17 11.27 1.55 19.83 1.55 31.49 0 50.92-15.94 50.92-42.76 0-24.1-16.72-38.49-46.26-38.49-12.05 0-20.21 1.17-24.49 2.33v77.37z"/>
-            </svg>
-        </a>
-    </div>
-</nav>
diff --git a/tools/linter_lib/custom_check.py b/tools/linter_lib/custom_check.py
index efbd0e2350..a9a53d69e5 100644
--- a/tools/linter_lib/custom_check.py
+++ b/tools/linter_lib/custom_check.py
@@ -695,7 +695,6 @@ html_rules: List["Rule"] = [
             "web/templates/pm_list_item.hbs",
             # Inline styling for an svg; could be moved to CSS files?
             "templates/zerver/landing_nav.html",
-            "templates/zerver/billing_nav.html",
             "templates/corporate/features.html",
             "templates/zerver/portico-header.html",
             "templates/corporate/billing.html",
diff --git a/web/styles/portico/billing.css b/web/styles/portico/billing.css
index 16f1a51c45..3cf87b5274 100644
--- a/web/styles/portico/billing.css
+++ b/web/styles/portico/billing.css
@@ -7,22 +7,10 @@
     background-color: hsl(0deg 0% 98%);
     height: 100vh;
 
-    .hero {
-        background-color: hsl(153deg 32% 55%);
-        color: hsl(153deg 32% 55%);
-        position: absolute;
-        top: 0;
-        width: 100%;
-    }
-
     .page-content {
         padding: 100px 0 30px;
     }
 
-    .small-hero {
-        padding: 120px 50px 0;
-    }
-
     .main {
         width: 800px;
         max-width: 90%;
@@ -415,3 +403,7 @@ input[name="licenses"] {
     margin-left: 2px;
     margin-top: 5px;
 }
+
+.header.portico-header {
+    display: block;
+}