diff --git a/network-api/networkapi/mozfest/templates/fragments/blocks/mozfest_tickets_block.html b/network-api/networkapi/mozfest/templates/fragments/blocks/mozfest_tickets_block.html new file mode 100644 index 00000000000..860139142d8 --- /dev/null +++ b/network-api/networkapi/mozfest/templates/fragments/blocks/mozfest_tickets_block.html @@ -0,0 +1,31 @@ +{% load wagtailcore_tags wagtailimages_tags %} + +{% block block_content %} +
+
+

{{ title }}

+
+ {% for tier in self.tickets %} + {% with count=self.tickets|length %} +
+
+

{{ tier.price }}

+

{{ tier.group }}

+
+ {{ tier.description|richtext }} +
+ {{ tier.link_text }} +
+ + {% if tier.sticker_text %} +
+

{{ tier.sticker_text }}

+
+ {% endif %} +
+ {% endwith %} + {% endfor %} +
+
+
+{% endblock block_content %} diff --git a/network-api/networkapi/mozfest/templates/mozfest/mozfest-base.html b/network-api/networkapi/mozfest/templates/mozfest/mozfest-base.html index 7ba1694c68d..6a60f7a8744 100644 --- a/network-api/networkapi/mozfest/templates/mozfest/mozfest-base.html +++ b/network-api/networkapi/mozfest/templates/mozfest/mozfest-base.html @@ -52,25 +52,10 @@ {% block content %} {% block secondary_nav %}{% endblock %} - {% if page.signup != None %} - - {# Use a two-column layout #} -
-
-
- {% include "partials/streamfield.html" with twocolumn=True %} -
- {% block cta %}{% include "partials/signup.html" %}{% endblock %} -
-
- {% else %} - - {# Single column layout #} -
- {% include "partials/streamfield.html" %} -
- - {% endif %} + {# Single column layout #} +
+ {% include "partials/streamfield.html" %} +
{% endblock %} diff --git a/tailwind.config.js b/tailwind.config.js index fad170aa514..6f61eba2eb6 100644 --- a/tailwind.config.js +++ b/tailwind.config.js @@ -230,8 +230,12 @@ module.exports = { }, purple: { 100: "#fa00ff", - 200: "#8e769d" + 200: "#8e769d", + 300: "#a0a2f8" }, + black: { + 100: "#202020", + } }, "dear-internet": { lilac: "#d3d5fc",