Add missing migration and re-add css after rebase

tbx/impact_reports/migrations/0003_alter_impactreportpage_body.py

@@ -0,0 +1,25 @@
+# Generated by Django 3.2.18 on 2023-07-31 13:21
+
+from django.db import migrations
+import tbx.core.blocks
+import wagtail.blocks
+import wagtail.embeds.blocks
+import wagtail.fields
+import wagtail.images.blocks
+import wagtailmarkdown.blocks
+import wagtailmedia.blocks
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('impact_reports', '0002_alter_impactreportpage_hero_image'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='impactreportpage',
+            name='body',
+            field=wagtail.fields.StreamField([('h2', wagtail.blocks.CharBlock(form_classname='title', icon='title', template='patterns/molecules/streamfield/blocks/heading2_block.html')), ('h3', wagtail.blocks.CharBlock(form_classname='title', icon='title', template='patterns/molecules/streamfield/blocks/heading3_block.html')), ('h4', wagtail.blocks.CharBlock(form_classname='title', icon='title', template='patterns/molecules/streamfield/blocks/heading4_block.html')), ('intro', wagtail.blocks.RichTextBlock(icon='pilcrow', template='patterns/molecules/streamfield/blocks/intro_block.html')), ('paragraph', wagtail.blocks.RichTextBlock(icon='pilcrow', template='patterns/molecules/streamfield/blocks/paragraph_block.html')), ('aligned_image', wagtail.blocks.StructBlock([('image', wagtail.images.blocks.ImageChooserBlock()), ('alignment', tbx.core.blocks.ImageFormatChoiceBlock()), ('caption', wagtail.blocks.CharBlock()), ('attribution', wagtail.blocks.CharBlock(required=False))], label='Aligned image', template='patterns/molecules/streamfield/blocks/aligned_image_block.html')), ('wide_image', wagtail.blocks.StructBlock([('image', wagtail.images.blocks.ImageChooserBlock())], label='Wide image', template='patterns/molecules/streamfield/blocks/wide_image_block.html')), ('bustout', wagtail.blocks.StructBlock([('image', wagtail.images.blocks.ImageChooserBlock()), ('text', wagtail.blocks.RichTextBlock())], template='patterns/molecules/streamfield/blocks/bustout_block.html')), ('pullquote', wagtail.blocks.StructBlock([('quote', wagtail.blocks.CharBlock(form_classname='quote title')), ('attribution', wagtail.blocks.CharBlock())], template='patterns/molecules/streamfield/blocks/pullquote_block.html')), ('raw_html', wagtail.blocks.RawHTMLBlock(icon='code', label='Raw HTML', template='patterns/molecules/streamfield/blocks/raw_html_block.html')), ('mailchimp_form', wagtail.blocks.RawHTMLBlock(icon='code', label='Mailchimp embedded form', template='patterns/molecules/streamfield/blocks/mailchimp_form_block.html')), ('markdown', wagtailmarkdown.blocks.MarkdownBlock(icon='code', template='patterns/molecules/streamfield/blocks/markdown_block.html')), ('embed', wagtail.embeds.blocks.EmbedBlock(group='Media', icon='code', template='patterns/molecules/streamfield/blocks/embed_block.html')), ('video_block', wagtail.blocks.StructBlock([('video', wagtailmedia.blocks.VideoChooserBlock()), ('autoplay', wagtail.blocks.BooleanBlock(default=False, help_text='Automatically start and loop the video. Please use sparingly.', required=False)), ('use_original_width', wagtail.blocks.BooleanBlock(default=False, help_text='Use the original width of the video instead of the default content width. Note that videos wider than the content width will be limited to the content width.', required=False))], group='Media')), ('story_embed', tbx.core.blocks.ExternalStoryEmbedBlock(icon='code', template='patterns/molecules/streamfield/blocks/external_story_block.html')), ('impact_report_heading', wagtail.blocks.StructBlock([('image', wagtail.images.blocks.ImageChooserBlock(required=False)), ('short_heading', wagtail.blocks.CharBlock(help_text='Used for the Table of Contents', required=False)), ('heading', wagtail.blocks.CharBlock(required=False))], group='Impact Report')), ('paragraph_with_quote', wagtail.blocks.StructBlock([('text', wagtail.blocks.RichTextBlock()), ('quote', wagtail.blocks.RichTextBlock(features=['bold', 'italic', 'link', 'document-link'])), ('attribution', wagtail.blocks.CharBlock(required=False)), ('quote_alignment', wagtail.blocks.ChoiceBlock(choices=[('left', 'Left'), ('right', 'Right')]))], group='Impact Report')), ('paragraph_with_image', wagtail.blocks.StructBlock([('text', wagtail.blocks.RichTextBlock()), ('image', wagtail.images.blocks.ImageChooserBlock(required=False)), ('image_alignment', wagtail.blocks.ChoiceBlock(choices=[('left', 'Left'), ('right', 'Right')]))], group='Impact Report')), ('three_column_image_grid', wagtail.blocks.StructBlock([('items', wagtail.blocks.ListBlock(wagtail.blocks.StructBlock([('image', wagtail.images.blocks.ImageChooserBlock()), ('text', wagtail.blocks.CharBlock())]), max_num=3, min_num=3))], group='Impact Report')), ('diagonal_image_grid', wagtail.blocks.StructBlock([('images', wagtail.blocks.ListBlock(wagtail.images.blocks.ImageChooserBlock(), max_num=3, min_num=3))], group='Impact Report')), ('two_column_text_grid', wagtail.blocks.StructBlock([('items', wagtail.blocks.ListBlock(wagtail.blocks.StructBlock([('image', wagtail.images.blocks.ImageChooserBlock()), ('heading', wagtail.blocks.CharBlock()), ('text', wagtail.blocks.CharBlock())])))], group='Impact Report'))], use_json_field=True),
+        ),
+    ]

tbx/static_src/sass/main.scss

@@ -68,6 +68,9 @@
 @import 'components/reason';
 @import 'components/related-content';
 @import 'components/related-item';
+@import 'components/report-hero';
+@import 'components/report-page';
+@import 'components/report-section';
 @import 'components/section-title';
 @import 'components/see-more';
 @import 'components/shards';