Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Adjust uneven block spacing for mozfest #12373

Merged
merged 5 commits into from
Jun 4, 2024
Merged

Adjust uneven block spacing for mozfest #12373

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
382c6c4
Remove extra spacing from image feature block
robdivincenzo May 23, 2024
f9b2cb9
Remove extra spacing from carousel text block
robdivincenzo May 23, 2024
e68243a
Remove auto paragraph spacer portion of #11862, opting for manual spa…
robdivincenzo May 24, 2024
79e6d5c
Merge branch 'main' into TP1-632-12315-altered-mozfest-block-spacing
robdivincenzo Jun 3, 2024
f984224
Merge branch 'main' into TP1-632-12315-altered-mozfest-block-spacing
danielfmiranda Jun 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion network-api/networkapi/mozfest/templates/fragments/blocks/carousel_text_block.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{% load wagtailcore_tags wagtailimages_tags %}

{% block block_content %}
<div class="tw-bg-black tw-dark tw-pb-16 tw-pt-20 large:tw-pt-40">
<div class="tw-bg-black tw-dark tw-pb-16 tw-pt-16 large:tw-pt-18">
<div class="tw-container">
<div class="tw-row tw-body">
<div class="tw-px-16 tw-w-full xlarge:tw-w-6/12">
Expand Down
4 changes: 0 additions & 4 deletions network-api/networkapi/mozfest/templates/mozfest/mozfest_homepage.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,6 @@
{% include "partials/primary_hero.html" with page=page %}
{% endblock %}

{% block streamfield %}
{% include "partials/streamfield_spacer.html" %}
{% endblock streamfield %}

{% block bootstrap_width %}col-lg-12{% endblock bootstrap_width %}

{% block footer_block %}
Expand Down
4 changes: 0 additions & 4 deletions network-api/networkapi/mozfest/templates/mozfest/mozfest_landing_page.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,6 @@
{% include "partials/primary_hero.html" with page=page %}
{% endblock hero_guts %}

{% block streamfield %}
{% include "partials/streamfield_spacer.html" %}
{% endblock streamfield %}

{% block bootstrap_width %}col-lg-12{% endblock bootstrap_width %}

{% block footer_block %}
Expand Down
7 changes: 0 additions & 7 deletions network-api/networkapi/mozfest/templates/partials/streamfield.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,5 @@
{% load wagtailcore_tags %}

{% for block in page.body %}
{# optionally render a pre and post paragraph spacer for landing_page / homepage page types with dark sections #}
{% if block.block_type == 'paragraph' %}
{% block pre_paragraph_spacer %}{% endblock pre_paragraph_spacer %}
{% endif %}
{% include_block block with parent_page=page %}
{% if block.block_type == 'paragraph' %}
{% block post_paragraph_spacer %}{% endblock post_paragraph_spacer %}
{% endif %}
{% endfor %}
9 changes: 0 additions & 9 deletions network-api/networkapi/mozfest/templates/partials/streamfield_spacer.html
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion network-api/networkapi/wagtailpages/templates/wagtailpages/blocks/image_feature_block.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
{% load wagtailcore_tags wagtailimages_tags %}

{% block block_content %}
<section class="tw-bg-white tw-mb-24">
<section class="tw-bg-white">
<div class="tw-container">
<div class="tw-row">
<div class="xlarge:tw-min-h-[400px] medium:tw-mb-24 tw-w-full">
Expand Down
Loading