templates: Fix duplicate inclusion of portico CSS.

Apparently, essentially every one of our landing pages extending
portico.html had two copies of portico.css included in their head
section; one from porticocustomhead (or the super of customhead) and
the other directly included.

Clean this up by removing all these duplicate inclusions of the
portico stylesheet.

templates/zerver/apps.html

@@ -5,10 +5,8 @@
 <style media="screen">
     .app.portico-page { padding-bottom: 0px; }
 </style>
-{% stylesheet 'portico' %}
 {% stylesheet 'landing-page' %}
 {{ render_bundle('landing-page') }}
-
 {% endblock %}
 
 {% block portico_content %}

templates/zerver/features.html

@@ -1,11 +1,8 @@
 {% extends "zerver/portico.html" %}
 
 {% block customhead %}
-
-{% stylesheet 'portico' %}
 {% stylesheet 'landing-page' %}
 {{ render_bundle('landing-page') }}
-
 {% endblock %}
 
 {% block portico_content %}

templates/zerver/for-companies.html

@@ -5,10 +5,7 @@
 {% endblock %}
 
 {% block customhead %}
-{{ super() }}
-
 <meta name="viewport" content="width=device-width, initial-scale=1.0">
-{% stylesheet 'portico' %}
 {% stylesheet 'landing-page' %}
 {{ render_bundle('landing-page') }}
 

templates/zerver/for-mystery-hunt.html

@@ -5,10 +5,7 @@
 {% endblock %}
 
 {% block customhead %}
-{{ super() }}
-
 <meta name="viewport" content="width=device-width, initial-scale=1.0">
-{% stylesheet 'portico' %}
 {% stylesheet 'landing-page' %}
 {{ render_bundle('landing-page') }}
 

templates/zerver/for-open-source.html

@@ -5,13 +5,9 @@
 {% endblock %}
 
 {% block customhead %}
-{{ super() }}
-
 <meta name="viewport" content="width=device-width, initial-scale=1.0">
-{% stylesheet 'portico' %}
 {% stylesheet 'landing-page' %}
 {{ render_bundle('landing-page') }}
-
 {% endblock %}
 
 {% block portico_content %}

templates/zerver/for-working-groups-and-communities.html

@@ -5,10 +5,7 @@
 {% endblock %}
 
 {% block customhead %}
-{{ super() }}
-
 <meta name="viewport" content="width=device-width, initial-scale=1.0">
-{% stylesheet 'portico' %}
 {% stylesheet 'landing-page' %}
 {{ render_bundle('landing-page') }}
 

templates/zerver/hello.html

@@ -2,7 +2,6 @@
 
 {% block customhead %}
 <meta name="viewport" content="width=device-width, initial-scale=1.0">
-{% stylesheet 'portico' %}
 {% stylesheet 'landing-page' %}
 {{ render_bundle('landing-page') }}
 <style>
@@ -10,7 +9,6 @@
     padding-bottom: 0px;
     }
 </style>
-
 {% endblock %}
 
 {% block portico_content %}

templates/zerver/history.html

@@ -5,10 +5,7 @@
 {% endblock %}
 
 {% block customhead %}
-{{ super() }}
-
 <meta name="viewport" content="width=device-width, initial-scale=1.0">
-{% stylesheet 'portico' %}
 {% stylesheet 'landing-page' %}
 {{ render_bundle('landing-page') }}
 

templates/zerver/integrations/index.html

@@ -1,13 +1,9 @@
 {% extends "zerver/portico.html" %}
 
 {% block customhead %}
-{{ super() }}
-
 <meta name="viewport" content="width=device-width, initial-scale=1.0">
-{% stylesheet 'portico' %}
 {% stylesheet 'landing-page' %}
 {{ render_bundle('integrations') }}
-
 {% endblock %}
 
 {% block hello_page_container %} hello-main{% endblock %}

templates/zerver/plans.html

@@ -2,10 +2,8 @@
 
 {% block customhead %}
 <meta name="viewport" content="width=device-width, initial-scale=1.0">
-{% stylesheet 'portico' %}
 {% stylesheet 'landing-page' %}
 {{ render_bundle('landing-page') }}
-
 {% endblock %}
 
 {% block portico_content %}

templates/zerver/portico-help.html

@@ -6,11 +6,9 @@
     hence the name.
 #}
 
-{% block customhead %}
-{% stylesheet 'portico' %}
-{% endblock %}
-
 {% block porticocustomhead %}
+{% stylesheet 'portico' %}
+{{ render_bundle('translations') }}
 {{ render_bundle('portico') }}
 {% endblock %}
 

templates/zerver/portico.html

@@ -6,12 +6,9 @@
     hence the name.
 #}
 
-{% block customhead %}
+{% block porticocustomhead %}
 {% stylesheet 'portico' %}
 {{ render_bundle('translations') }}
-{% endblock %}
-
-{% block porticocustomhead %}
 {{ render_bundle('portico') }}
 {% endblock %}
 

templates/zerver/privacy.html

@@ -5,13 +5,9 @@
 {% endblock %}
 
 {% block customhead %}
-{{ super() }}
-
 <meta name="viewport" content="width=device-width, initial-scale=1.0">
-{% stylesheet 'portico' %}
 {% stylesheet 'landing-page' %}
 {{ render_bundle('landing-page') }}
-
 {% endblock %}
 
 {% block portico_content %}

templates/zerver/team.html

@@ -5,16 +5,12 @@
 {% endblock %}
 
 {% block customhead %}
-{{ super() }}
-
 <meta name="viewport" content="width=device-width, initial-scale=1.0">
-{% stylesheet 'portico' %}
 {% stylesheet 'landing-page' %}
 <script>
     var contributors_list = {{ contrib|safe }};
 </script>
 {{ render_bundle('landing-page') }}
-
 {% endblock %}
 
 {% block portico_content %}

templates/zerver/terms.html

@@ -3,10 +3,7 @@
 {# Terms of Service. #}
 
 {% block customhead %}
-{{ super() }}
-
 <meta name="viewport" content="width=device-width, initial-scale=1.0">
-{% stylesheet 'portico' %}
 {% stylesheet 'landing-page' %}
 {{ render_bundle('landing-page') }}
 

templates/zerver/why-zulip.html

@@ -5,13 +5,9 @@
 {% endblock %}
 
 {% block customhead %}
-{{ super() }}
-
 <meta name="viewport" content="width=device-width, initial-scale=1.0">
-{% stylesheet 'portico' %}
 {% stylesheet 'landing-page' %}
 {{ render_bundle('landing-page') }}
-
 {% endblock %}
 
 {% block portico_content %}

templates/zilencer/billing.html

@@ -2,10 +2,8 @@
 
 {% block customhead %}
 <meta name="viewport" content="width=device-width, initial-scale=1.0">
-{% stylesheet 'portico' %}
 {% stylesheet 'landing-page' %}
 {{ render_bundle('landing-page') }}
-
 {% endblock %}
 
 {% block portico_content %}