diff --git a/maintenance/maintenance.html b/maintenance/maintenance.html index 06e24fe46bc..ec9349cf7a7 100644 --- a/maintenance/maintenance.html +++ b/maintenance/maintenance.html @@ -144,7 +144,7 @@
More about us
-
+

Mozilla is a global non-profit dedicated to putting you in control of your online experience and shaping the future of the web for the public good. Visit us at foundation.mozilla.org. Most content available under a Creative Commons license.

diff --git a/network-api/networkapi/mozfest/templates/fragments/hero/featured_video.html b/network-api/networkapi/mozfest/templates/fragments/hero/featured_video.html index 46f377c64b9..460507b8054 100644 --- a/network-api/networkapi/mozfest/templates/fragments/hero/featured_video.html +++ b/network-api/networkapi/mozfest/templates/fragments/hero/featured_video.html @@ -30,7 +30,7 @@
{# Play Icon #} + class="group-hover:tw--translate-y-2 tw-relative tw-z-10 tw-transition tw-w-[75px] tw-h-[75px] medium:tw-w-[108px] medium:tw-h-[108px]" alt=""> diff --git a/network-api/networkapi/mozfest/templates/fragments/mixed_content_card.html b/network-api/networkapi/mozfest/templates/fragments/mixed_content_card.html index a2edf1ce260..3462d551ca8 100644 --- a/network-api/networkapi/mozfest/templates/fragments/mixed_content_card.html +++ b/network-api/networkapi/mozfest/templates/fragments/mixed_content_card.html @@ -6,7 +6,7 @@ {% if card.link_page or card.link_url %} {% endif %} - {{ card.alt_text }} + {{ card.alt_text }} {% if card.link_page or card.link_url %} {% endif %} diff --git a/network-api/networkapi/templates/buyersguide/fragments/consumer_creepometer_page_2023/best_and_worst_products.html b/network-api/networkapi/templates/buyersguide/fragments/consumer_creepometer_page_2023/best_and_worst_products.html index 8351dc4403e..24638884851 100644 --- a/network-api/networkapi/templates/buyersguide/fragments/consumer_creepometer_page_2023/best_and_worst_products.html +++ b/network-api/networkapi/templates/buyersguide/fragments/consumer_creepometer_page_2023/best_and_worst_products.html @@ -4,7 +4,7 @@
- + {% include "../consumer_creepometer_page_2023/animated-eyes.html" with eye_base_class="tw-w-[15%] tw-h-[15%]" left_eye_class="tw-top-[54%] tw-left-[30%]" right_eye_class="tw-top-[53%] tw-left-[53%]" %}
diff --git a/network-api/networkapi/templates/buyersguide/fragments/consumer_creepometer_page_2023/big_picture_trends.html b/network-api/networkapi/templates/buyersguide/fragments/consumer_creepometer_page_2023/big_picture_trends.html index 131b1004a69..7e4d97f9c05 100644 --- a/network-api/networkapi/templates/buyersguide/fragments/consumer_creepometer_page_2023/big_picture_trends.html +++ b/network-api/networkapi/templates/buyersguide/fragments/consumer_creepometer_page_2023/big_picture_trends.html @@ -19,13 +19,13 @@

Products are getting more secure, but also a

The mental health app BetterHelp shares your data with advertisers, social media platforms, and sister companies.

- BetterHelp logo + BetterHelp logo

The Japanese car manufacturer Nissan collects a wide range of information, including sexual activity, health diagnosis data, and genetic information — but doesn’t specify how.

- Nissan logo + Nissan logo

@@ -40,7 +40,7 @@

An increasing number of products can’t be u

For example:

The Verizon GizmoWatch is a product for kids, but all of its features — even simple to-do lists — require an internet connection.

- Verizon Gizmowatch + Verizon Gizmowatch

@@ -53,7 +53,7 @@

Privacy policies are getting ridiculous.

For example:

Car manufacturer Toyota has more than 10 different privacy policy documents — an unreasonable number for consumers to engage with.

- Toyota logo + Toyota logo diff --git a/network-api/networkapi/templates/buyersguide/fragments/consumer_creepometer_page_2023/by_the_numbers.html b/network-api/networkapi/templates/buyersguide/fragments/consumer_creepometer_page_2023/by_the_numbers.html index 17fd4de5035..c1298ab6e57 100644 --- a/network-api/networkapi/templates/buyersguide/fragments/consumer_creepometer_page_2023/by_the_numbers.html +++ b/network-api/networkapi/templates/buyersguide/fragments/consumer_creepometer_page_2023/by_the_numbers.html @@ -4,7 +4,7 @@
- + {% include "../consumer_creepometer_page_2023/animated-eyes.html" with eye_base_class="tw-w-[21%] tw-h-[21%]" left_eye_class="tw-top-[39%] tw-left-[22%]" right_eye_class="tw-top-[39%] tw-left-[56%]" %}
diff --git a/network-api/networkapi/templates/buyersguide/fragments/consumer_creepometer_page_2023/hero.html b/network-api/networkapi/templates/buyersguide/fragments/consumer_creepometer_page_2023/hero.html index 761ddd27239..b1a91ee0e6a 100644 --- a/network-api/networkapi/templates/buyersguide/fragments/consumer_creepometer_page_2023/hero.html +++ b/network-api/networkapi/templates/buyersguide/fragments/consumer_creepometer_page_2023/hero.html @@ -4,7 +4,7 @@
- + {% include "../consumer_creepometer_page_2023/animated-eyes.html" with eye_base_class="tw-w-[14%] tw-h-[14%]" left_eye_class="tw-top-[42%] tw-left-[33%]" right_eye_class="tw-top-[42%] tw-left-[54%]" %}
@@ -23,7 +23,7 @@

- +
{% include "../consumer_creepometer_page_2023/animated-eyes.html" with eye_base_class="tw-w-[20%] tw-h-[20%]" left_eye_class="tw-top-[37%] tw-left-[22%]" right_eye_class="tw-top-[37%] tw-left-[57%]" %}
diff --git a/network-api/networkapi/templates/buyersguide/fragments/consumer_creepometer_page_2023/quiz.html b/network-api/networkapi/templates/buyersguide/fragments/consumer_creepometer_page_2023/quiz.html index 128996162a1..67401f20a18 100644 --- a/network-api/networkapi/templates/buyersguide/fragments/consumer_creepometer_page_2023/quiz.html +++ b/network-api/networkapi/templates/buyersguide/fragments/consumer_creepometer_page_2023/quiz.html @@ -7,7 +7,7 @@
- + {% include "../consumer_creepometer_page_2023/animated-eyes.html" with eye_base_class="tw-w-[15%] tw-h-[15%]" left_eye_class="tw-top-[42%] tw-left-[33%]" right_eye_class="tw-top-[42%] tw-left-[56%]" %}
diff --git a/network-api/networkapi/templates/buyersguide/fragments/consumer_creepometer_page_2023/stay_in_control.html b/network-api/networkapi/templates/buyersguide/fragments/consumer_creepometer_page_2023/stay_in_control.html index 4760c919e5c..93e590152c3 100644 --- a/network-api/networkapi/templates/buyersguide/fragments/consumer_creepometer_page_2023/stay_in_control.html +++ b/network-api/networkapi/templates/buyersguide/fragments/consumer_creepometer_page_2023/stay_in_control.html @@ -2,7 +2,7 @@
- + {% include "../consumer_creepometer_page_2023/animated-eyes.html" with eye_base_class="tw-w-[14%] tw-h-[14%]" left_eye_class="tw-top-[41%] tw-left-[37%]" right_eye_class="tw-top-[41%] tw-left-[56%]" %}
diff --git a/network-api/networkapi/templates/buyersguide/fragments/consumer_creepometer_page_2023/sub_nav.html b/network-api/networkapi/templates/buyersguide/fragments/consumer_creepometer_page_2023/sub_nav.html index a5025754654..36f5403b26e 100644 --- a/network-api/networkapi/templates/buyersguide/fragments/consumer_creepometer_page_2023/sub_nav.html +++ b/network-api/networkapi/templates/buyersguide/fragments/consumer_creepometer_page_2023/sub_nav.html @@ -2,7 +2,7 @@
- + {% include "../consumer_creepometer_page_2023/animated-eyes.html" with eye_base_class="tw-w-[20%] tw-h-[20%]" left_eye_class="tw-top-[37%] tw-left-[24%]" right_eye_class="tw-top-[37%] tw-left-[56%]" %}

Mozilla’s Annual Consumer Creep-O-Meter distills what’s good, what’s bad, and what’s just plain creepy in the world of consumer tech.

diff --git a/network-api/networkapi/templates/fragments/blocks/card_grid_block.html b/network-api/networkapi/templates/fragments/blocks/card_grid_block.html index 63ebdb459a3..9f38e7613e7 100644 --- a/network-api/networkapi/templates/fragments/blocks/card_grid_block.html +++ b/network-api/networkapi/templates/fragments/blocks/card_grid_block.html @@ -37,7 +37,7 @@ - {{ img_small.alt_text }} + {{ img_small.alt_text }}
diff --git a/network-api/networkapi/templates/fragments/blog_index_feature.html b/network-api/networkapi/templates/fragments/blog_index_feature.html index 09b7556b7d5..5969dca9e73 100644 --- a/network-api/networkapi/templates/fragments/blog_index_feature.html +++ b/network-api/networkapi/templates/fragments/blog_index_feature.html @@ -28,7 +28,7 @@

- {% trans + {% trans

{% else %} diff --git a/network-api/networkapi/templates/fragments/buyersguide/article_listing_compact.html b/network-api/networkapi/templates/fragments/buyersguide/article_listing_compact.html index bb26f8686ec..9dfdab07190 100644 --- a/network-api/networkapi/templates/fragments/buyersguide/article_listing_compact.html +++ b/network-api/networkapi/templates/fragments/buyersguide/article_listing_compact.html @@ -19,7 +19,7 @@ {% if show_images %} {% image article.get_meta_image fill-156x156 as img %} - {{ img.alt }} + {{ img.alt }} {% endif %} {{ article.title }} diff --git a/network-api/networkapi/templates/fragments/buyersguide/ask_jen_advice_section.html b/network-api/networkapi/templates/fragments/buyersguide/ask_jen_advice_section.html index 882dcd9f3e3..02f594e10bf 100644 --- a/network-api/networkapi/templates/fragments/buyersguide/ask_jen_advice_section.html +++ b/network-api/networkapi/templates/fragments/buyersguide/ask_jen_advice_section.html @@ -41,7 +41,7 @@

{% t {% include "./arrow_link.html" with link_href=link_href link_text=link_text extra_classes="tw-text-xl" %}

- +
diff --git a/network-api/networkapi/templates/fragments/buyersguide/editorial_content_list_product_update_card.html b/network-api/networkapi/templates/fragments/buyersguide/editorial_content_list_product_update_card.html index 80ec804f127..2597ec1cfd5 100644 --- a/network-api/networkapi/templates/fragments/buyersguide/editorial_content_list_product_update_card.html +++ b/network-api/networkapi/templates/fragments/buyersguide/editorial_content_list_product_update_card.html @@ -4,7 +4,7 @@

{{ update.title }}

{{ update.author }} - +

{{ update.snippet }}

 diff --git a/network-api/networkapi/templates/fragments/buyersguide/featured_page.html b/network-api/networkapi/templates/fragments/buyersguide/featured_page.html index b65a700f62a..15cf555dc66 100644 --- a/network-api/networkapi/templates/fragments/buyersguide/featured_page.html +++ b/network-api/networkapi/templates/fragments/buyersguide/featured_page.html @@ -30,7 +30,7 @@ srcset="{{ img2x.url }} 2x, {{ img3x.url }} 3x" alt="{{ img1x.alt }}" class="tw-w-full tw-aspect-video tw-rounded-xl tw-object-cover" - /> + > + class="tw-bg-blue-05 tw-outline-none tw-py-4 tw-text-base tw-text-blue-60 tw-min-w-0 placeholder:tw-text-blue-60 placeholder:tw-text-[14px] tw-w-full">

diff --git a/network-api/networkapi/templates/fragments/custom_hero_guts.html b/network-api/networkapi/templates/fragments/custom_hero_guts.html index 392b1837ab5..fbba6545d34 100644 --- a/network-api/networkapi/templates/fragments/custom_hero_guts.html +++ b/network-api/networkapi/templates/fragments/custom_hero_guts.html @@ -81,7 +81,7 @@

href="{{ download_file.url }}" download> + class='tw-h-9 tw-w-9 tw-mr-6 tw-mt-[1px] tw-brightness-0 {% if btn_setting == page.HERO_BTN_STYLE_PRIMARY %} {{ primary_icon_class }} {% elif btn_setting == page.HERO_BTN_STYLE_SECONDARY %} {{ secondary_icon_class }} {% else %} {{ tertiary_icon_class }} {% endif %}'> {% trans "Download PDF" %} {% if download_file.file_size %} ({{ download_file.file_size|filesizeformat }}) diff --git a/network-api/networkapi/templates/fragments/libraries/filter_form.html b/network-api/networkapi/templates/fragments/libraries/filter_form.html index b37bb3973a4..15fce047fe8 100644 --- a/network-api/networkapi/templates/fragments/libraries/filter_form.html +++ b/network-api/networkapi/templates/fragments/libraries/filter_form.html @@ -11,7 +11,7 @@

{{ field.label_tag }}

{% if field.field.widget.input_type == "checkbox" %} {% for pk, choice in field.field.widget.choices %}
  • - + diff --git a/network-api/networkapi/templates/fragments/responsive_screen_wide_image.html b/network-api/networkapi/templates/fragments/responsive_screen_wide_image.html index 6cf73f23046..d48548f65db 100644 --- a/network-api/networkapi/templates/fragments/responsive_screen_wide_image.html +++ b/network-api/networkapi/templates/fragments/responsive_screen_wide_image.html @@ -56,5 +56,5 @@ {% endcomment %} src="{{ img_1200.url }}" alt="" - /> + > diff --git a/network-api/networkapi/templates/pages/buyersguide/about/press.html b/network-api/networkapi/templates/pages/buyersguide/about/press.html index 8a37f39c36e..3c3d381cdcf 100644 --- a/network-api/networkapi/templates/pages/buyersguide/about/press.html +++ b/network-api/networkapi/templates/pages/buyersguide/about/press.html @@ -19,8 +19,8 @@

    {% trans "Are you a journalist researching connected products or a member of the press covering privacy?" %} - - + +

    {% blocktrans with pni_url="https://foundation.mozilla.org/privacynotincluded/" trimmed %} diff --git a/network-api/networkapi/templates/pages/buyersguide/article_page.html b/network-api/networkapi/templates/pages/buyersguide/article_page.html index 4f355c66c48..6997fa48cda 100644 --- a/network-api/networkapi/templates/pages/buyersguide/article_page.html +++ b/network-api/networkapi/templates/pages/buyersguide/article_page.html @@ -64,7 +64,7 @@

    {{ page.title }}

    srcset="{% image_url author_profile.image "fill-150x150" %} 2x, {% image_url author_profile.image "fill-225x225" %} 3x" alt="{{ author_profile.name }}" title="{{ author_profile.name }}" - /> + >

    • {% endif %}
    diff --git a/network-api/networkapi/templates/pages/libraries/landing_page.html b/network-api/networkapi/templates/pages/libraries/landing_page.html index 6d6bd695c3a..7e2a3bbaef4 100644 --- a/network-api/networkapi/templates/pages/libraries/landing_page.html +++ b/network-api/networkapi/templates/pages/libraries/landing_page.html @@ -56,7 +56,7 @@

    -
    +

    {% block featured_taxonomies_label %} {% trans "Browse by topic" context "Topic list heading" %} diff --git a/network-api/networkapi/templates/pages/libraries/profile_page.html b/network-api/networkapi/templates/pages/libraries/profile_page.html index 27597ed3a80..90f34f8bce8 100644 --- a/network-api/networkapi/templates/pages/libraries/profile_page.html +++ b/network-api/networkapi/templates/pages/libraries/profile_page.html @@ -21,9 +21,9 @@ {% if author_profile.image %} {% image author_profile.image fill-256x256 as img_1x %} {% image author_profile.image fill-512x512 as img_2x %} - {{ img_2x.alt }} + {{ img_2x.alt }} {% else %} - {{ author_profile.name }} + {{ author_profile.name }} {% endif %} {% endwith %}

    diff --git a/network-api/networkapi/templates/pages/styleguide.html b/network-api/networkapi/templates/pages/styleguide.html index c7e9c242255..9851204ec5a 100644 --- a/network-api/networkapi/templates/pages/styleguide.html +++ b/network-api/networkapi/templates/pages/styleguide.html @@ -18,7 +18,7 @@

    Site-wide Palette

    -
    +
    {% include "wagtailpages/fragments/styleguide_color_block.html" with classname="tw-bg-white" name="White ($white)" hex="#ffffff" %} @@ -152,7 +152,7 @@

    Privacy Not Included Palette

    -
    +
    {% include "wagtailpages/fragments/styleguide_color_block.html" with classname="tw-bg-pni-blue" name="PNI Blue ($pni-blue)" hex="#1808f2" %} @@ -174,7 +174,7 @@

    Festival Palette

    -
    +
    {% include "wagtailpages/fragments/styleguide_color_block.html" with classname="tw-bg-festival-blue" name="Festival Dark Blue ($festival-dark-blue)" hex="#0e11bf" %} @@ -200,7 +200,7 @@

    Breakpoints

    -
    +
    @@ -248,7 +248,7 @@

    Columns

    -
    +

    1

    @@ -321,7 +321,7 @@

    12

    -
    +

    @@ -334,7 +334,7 @@

    Headers

    -
    +

    .tw-h1-heading

    @@ -358,7 +358,7 @@ -
    +

    .tw-h1-heading with link

    @@ -382,7 +382,7 @@

    Paragraphs

    -
    +

    .tw-body-large with bold and strong and italic text

    @@ -403,7 +403,7 @@ -
    +

    .tw-body-large with link

    @@ -419,7 +419,7 @@

    -
    +

    Default <ol> style

      @@ -439,14 +439,14 @@

      Anchors

      -
      +
      .tw-cta-link

      Dark Theme Headers

      -
      +

      .tw-h1-heading

      @@ -471,7 +471,7 @@ -
      +

      .tw-h1-heading with link

      @@ -497,7 +497,7 @@

      Dark Theme Paragraphs

      -
      +

      .tw-body-large with bold and strong and italic text

      @@ -521,7 +521,7 @@ -
      +

      .tw-body with link

      @@ -538,7 +538,7 @@

      Dark Theme Lists

      -
      +

      Default <ol> style

      @@ -560,7 +560,7 @@

      Dark Theme Anchors

      -
      +
      .tw-cta-link
      @@ -578,7 +578,7 @@

      Default (Tailwind)

      -
      +
      @@ -621,7 +621,7 @@

      Dark Theme

      -
      +
      diff --git a/network-api/networkapi/wagtailpages/templates/fragments/chapter_table_of_contents.html b/network-api/networkapi/wagtailpages/templates/fragments/chapter_table_of_contents.html index e8a3deb46fc..ee1538a722d 100644 --- a/network-api/networkapi/wagtailpages/templates/fragments/chapter_table_of_contents.html +++ b/network-api/networkapi/wagtailpages/templates/fragments/chapter_table_of_contents.html @@ -48,8 +48,8 @@

      tw-outline-none tw-p-0 tw-mr-8"> - - + + {% endif %} @@ -66,7 +66,7 @@

      tw-outline-none tw-p-0 tw-mr-8"> - + {% endif %}

      diff --git a/network-api/networkapi/wagtailpages/templates/fragments/child_table_of_contents.html b/network-api/networkapi/wagtailpages/templates/fragments/child_table_of_contents.html index 347a00b4f77..e1fff950174 100644 --- a/network-api/networkapi/wagtailpages/templates/fragments/child_table_of_contents.html +++ b/network-api/networkapi/wagtailpages/templates/fragments/child_table_of_contents.html @@ -13,7 +13,7 @@ tw-outline-none group tw-p-0"> - + {{ child_page.title }} @@ -53,8 +53,8 @@

      tw-outline-none tw-p-0 tw-mr-8"> - - + + {% endif %}

      diff --git a/network-api/networkapi/wagtailpages/templates/maintenance/maintenance.html b/network-api/networkapi/wagtailpages/templates/maintenance/maintenance.html index 580bb30d5e5..6776d6ed2f1 100644 --- a/network-api/networkapi/wagtailpages/templates/maintenance/maintenance.html +++ b/network-api/networkapi/wagtailpages/templates/maintenance/maintenance.html @@ -143,7 +143,7 @@
      More about us
      -
      +

      Mozilla is a global non-profit dedicated to putting you in control of your online experience and shaping the future of the web for the public good. Visit us at foundation.mozilla.org. Most content available under a Creative Commons license.

      diff --git a/network-api/networkapi/wagtailpages/templates/publication_child_menu.html b/network-api/networkapi/wagtailpages/templates/publication_child_menu.html index f1b66d695e7..8d5fb357a4f 100644 --- a/network-api/networkapi/wagtailpages/templates/publication_child_menu.html +++ b/network-api/networkapi/wagtailpages/templates/publication_child_menu.html @@ -12,7 +12,7 @@ tw-items-center tw-outline-none tw-p-0"> - + {{ child_page.title }} @@ -29,7 +29,7 @@ src='{{ thumbnail.url }}' {% endif %} {% endwith %} - /> + > {{ grandchild_page }} @@ -45,8 +45,8 @@ tw-bg-white tw-outline-none tw-p-0"> - - + + {% endif %}
      diff --git a/network-api/networkapi/wagtailpages/templates/sticky_dropdown.html b/network-api/networkapi/wagtailpages/templates/sticky_dropdown.html index a88427c96c3..cefb24f3680 100644 --- a/network-api/networkapi/wagtailpages/templates/sticky_dropdown.html +++ b/network-api/networkapi/wagtailpages/templates/sticky_dropdown.html @@ -34,7 +34,7 @@ src='{{ thumbnail.url }}' {% endif %} {% endwith %} - /> + > {{ child_page }} @@ -51,8 +51,8 @@ tw-bg-white tw-outline-none tw-p-0"> - - + + {% endif %} @@ -68,7 +68,7 @@ tw-place-items-center tw-outline-none tw-p-0"> - + {% endif %}
      diff --git a/network-api/networkapi/wagtailpages/templates/wagtailpages/blocks/about_block.html b/network-api/networkapi/wagtailpages/templates/wagtailpages/blocks/about_block.html index 5ad702a5997..9d1b0e0a6db 100644 --- a/network-api/networkapi/wagtailpages/templates/wagtailpages/blocks/about_block.html +++ b/network-api/networkapi/wagtailpages/templates/wagtailpages/blocks/about_block.html @@ -15,7 +15,7 @@ height="{{ img_2x.height|unlocalize }}" alt="{{ self.image_alt_text }}" class="tw-w-full" - /> + >

      {{ self.heading }}

      diff --git a/network-api/networkapi/wagtailpages/templates/wagtailpages/blocks/accordion_block.html b/network-api/networkapi/wagtailpages/templates/wagtailpages/blocks/accordion_block.html index 8b15a1796ce..a66852d58af 100644 --- a/network-api/networkapi/wagtailpages/templates/wagtailpages/blocks/accordion_block.html +++ b/network-api/networkapi/wagtailpages/templates/wagtailpages/blocks/accordion_block.html @@ -6,8 +6,8 @@
      {{ block.title }} - - + + {% with item=block count=self.accordion_items|length %} {{ item.content }} diff --git a/network-api/networkapi/wagtailpages/templates/wagtailpages/blocks/annotated_image_block.html b/network-api/networkapi/wagtailpages/templates/wagtailpages/blocks/annotated_image_block.html index ac4df4c46b4..27b96d65e67 100644 --- a/network-api/networkapi/wagtailpages/templates/wagtailpages/blocks/annotated_image_block.html +++ b/network-api/networkapi/wagtailpages/templates/wagtailpages/blocks/annotated_image_block.html @@ -20,7 +20,7 @@ {% image value.image original as img %}
      - {{ value.altText }} + {{ value.altText }} {% if value.caption %}
      {% if value.captionURL %}{% endif %} diff --git a/network-api/networkapi/wagtailpages/templates/wagtailpages/blocks/article_double_image_block.html b/network-api/networkapi/wagtailpages/templates/wagtailpages/blocks/article_double_image_block.html index b1dc7282ba4..d8fa25e702d 100644 --- a/network-api/networkapi/wagtailpages/templates/wagtailpages/blocks/article_double_image_block.html +++ b/network-api/networkapi/wagtailpages/templates/wagtailpages/blocks/article_double_image_block.html @@ -8,7 +8,7 @@ {% image self.image_1 fill-445x324 as img1 %}
      - {{ img1.alt }} + {{ img1.alt }} {% if self.image_1_caption %}
      {{ self.image_1_caption|richtext|remove_wrapping|safe }} @@ -21,7 +21,7 @@ {% image self.image_2 fill-445x324 as img2 %}
      - {{ img2.alt }} + {{ img2.alt }} {% if self.image_2_caption %}
      {{ self.image_2_caption|richtext|remove_wrapping|safe }} diff --git a/network-api/networkapi/wagtailpages/templates/wagtailpages/blocks/article_full_width_image_block.html b/network-api/networkapi/wagtailpages/templates/wagtailpages/blocks/article_full_width_image_block.html index 850f26179a3..0303f9bb861 100644 --- a/network-api/networkapi/wagtailpages/templates/wagtailpages/blocks/article_full_width_image_block.html +++ b/network-api/networkapi/wagtailpages/templates/wagtailpages/blocks/article_full_width_image_block.html @@ -13,7 +13,7 @@
      {% custom_image_height self.image self.image_height as img %}
      - {{ img.alt }} + {{ img.alt }} {% if self.caption %}
      diff --git a/network-api/networkapi/wagtailpages/templates/wagtailpages/blocks/article_image_block.html b/network-api/networkapi/wagtailpages/templates/wagtailpages/blocks/article_image_block.html index b4cac85fe33..ff49da5286c 100644 --- a/network-api/networkapi/wagtailpages/templates/wagtailpages/blocks/article_image_block.html +++ b/network-api/networkapi/wagtailpages/templates/wagtailpages/blocks/article_image_block.html @@ -17,7 +17,7 @@ {% image self.image width-1840 as img %}
      {% if self.alt_text %}{{ self.alt_text }}{% else %}{{ img.alt }}{% endif %} + class="tw-w-full"> {% if self.caption %}
      {{ self.caption|richtext|remove_wrapping|safe }} diff --git a/network-api/networkapi/wagtailpages/templates/wagtailpages/blocks/article_teaser_block.html b/network-api/networkapi/wagtailpages/templates/wagtailpages/blocks/article_teaser_block.html index 037d6b536af..ab44137c5e1 100644 --- a/network-api/networkapi/wagtailpages/templates/wagtailpages/blocks/article_teaser_block.html +++ b/network-api/networkapi/wagtailpages/templates/wagtailpages/blocks/article_teaser_block.html @@ -22,7 +22,7 @@ {% with author_image_classes="-tw-ml-[0.7rem] tw-overflow-hidden tw-rounded-full tw-border-2 tw-border-white tw-inline-block tw-w-20 tw-h-20 tw-border-r d-flex align-items-center justify-content-center last:tw-mr-4" no_image_classes="tw-bg-[url('../_images/author-placeholder.jpg')] tw-bg-cover " %}
      {% if author.author.image %} - {{ author.author.name }} + {{ author.author.name }} {% endif %}
      {% endwith %} diff --git a/network-api/networkapi/wagtailpages/templates/wagtailpages/blocks/group_listing_block.html b/network-api/networkapi/wagtailpages/templates/wagtailpages/blocks/group_listing_block.html index 2a5a53ce022..ee36cc5384a 100644 --- a/network-api/networkapi/wagtailpages/templates/wagtailpages/blocks/group_listing_block.html +++ b/network-api/networkapi/wagtailpages/templates/wagtailpages/blocks/group_listing_block.html @@ -17,7 +17,7 @@

      {{ self.ti {% if card.url %} {% endif %} - {{ card.alt_text }} + {{ card.alt_text }} {% if card.url %} {% endif %} diff --git a/network-api/networkapi/wagtailpages/templates/wagtailpages/blocks/profile_block_rounded.html b/network-api/networkapi/wagtailpages/templates/wagtailpages/blocks/profile_block_rounded.html index 095c5a9342d..7759a3f4473 100644 --- a/network-api/networkapi/wagtailpages/templates/wagtailpages/blocks/profile_block_rounded.html +++ b/network-api/networkapi/wagtailpages/templates/wagtailpages/blocks/profile_block_rounded.html @@ -14,7 +14,7 @@ srcset="{% image_url card.image "fill-280x280" %} 2x, {% image_url card.image "fill-420x420" %} 3x" alt="{{ card.alt_text }}" title="{{ card.name }}" - /> + > {% endif %}
      diff --git a/network-api/networkapi/wagtailpages/templates/wagtailpages/fragments/blog_author_detail_header.html b/network-api/networkapi/wagtailpages/templates/wagtailpages/fragments/blog_author_detail_header.html index 2d620c17caa..c4b4df65eb4 100644 --- a/network-api/networkapi/wagtailpages/templates/wagtailpages/fragments/blog_author_detail_header.html +++ b/network-api/networkapi/wagtailpages/templates/wagtailpages/fragments/blog_author_detail_header.html @@ -10,9 +10,9 @@ {% if author.image %} {% image author.image fill-120x120 as img_1x %} {% image author.image fill-240x240 as img_2x %} - {{ img_2x.alt }} + {{ img_2x.alt }} {% else %} - {{ author.name }} + {{ author.name }} {% endif %} {% endwith %}
      diff --git a/network-api/networkapi/wagtailpages/templates/wagtailpages/fragments/blog_authors_intros.html b/network-api/networkapi/wagtailpages/templates/wagtailpages/fragments/blog_authors_intros.html index b1b4eb3d30f..ae2af7d7225 100644 --- a/network-api/networkapi/wagtailpages/templates/wagtailpages/fragments/blog_authors_intros.html +++ b/network-api/networkapi/wagtailpages/templates/wagtailpages/fragments/blog_authors_intros.html @@ -8,7 +8,7 @@
      {% if author.image %} - {{ author.name }} + {{ author.name }} {% endif %}
      diff --git a/network-api/networkapi/wagtailpages/templates/wagtailpages/fragments/search_bar.html b/network-api/networkapi/wagtailpages/templates/wagtailpages/fragments/search_bar.html index 83a846312d1..c10dd58b8d3 100644 --- a/network-api/networkapi/wagtailpages/templates/wagtailpages/fragments/search_bar.html +++ b/network-api/networkapi/wagtailpages/templates/wagtailpages/fragments/search_bar.html @@ -2,7 +2,7 @@
      {% trans "Search…" as search_placeholder %} - + diff --git a/network-api/networkapi/wagtailpages/templates/wagtailpages/pages/youtube-regrets-2021/fragments/recommendations.html b/network-api/networkapi/wagtailpages/templates/wagtailpages/pages/youtube-regrets-2021/fragments/recommendations.html index cdd88f1ec0f..4d20ac885eb 100644 --- a/network-api/networkapi/wagtailpages/templates/wagtailpages/pages/youtube-regrets-2021/fragments/recommendations.html +++ b/network-api/networkapi/wagtailpages/templates/wagtailpages/pages/youtube-regrets-2021/fragments/recommendations.html @@ -20,13 +20,13 @@

      {% trans "Our recommendation: Urge Policymakers must require YouTube to release adequate public data about their algorithm and create research tools and legal protections that allow for real, independent scrutiny of the platform. {% endblocktrans %}

      -
      +

      {% blocktrans trimmed %} YouTube and other companies must publish audits of their algorithm and give people meaningful control over how their data is used for recommendations, including allowing people to opt-out of personalized recommendations. {% endblocktrans %}

      -
      +

      {% blocktrans with download_link="https://foundation.mozilla.org/campaigns/regrets-reporter/" trimmed %} People who use YouTube should get informed about how YouTube recommendations work and download RegretsReporter to contribute data to future crowdsourced research. diff --git a/network-api/networkapi/wagtailpages/templates/wagtailpages/pages/youtube-regrets-2022/fragments/recommendations.html b/network-api/networkapi/wagtailpages/templates/wagtailpages/pages/youtube-regrets-2022/fragments/recommendations.html index 0c5a918505d..9747721da47 100644 --- a/network-api/networkapi/wagtailpages/templates/wagtailpages/pages/youtube-regrets-2022/fragments/recommendations.html +++ b/network-api/networkapi/wagtailpages/templates/wagtailpages/pages/youtube-regrets-2022/fragments/recommendations.html @@ -15,19 +15,19 @@

      {% trans "Our main recommendation YouTube’s user controls should be easy to understand and access. People should be provided with clear information about the steps they can take to influence their recommendations, and should be empowered to use those tools. {% endblocktrans %}

      -
      +

      {% blocktrans trimmed %} YouTube should design its feedback tools in a way that puts people in the driver’s seat. Feedback tools should enable people to proactively shape their experience, with user feedback given more weight in determining what videos are recommended. {% endblocktrans %}

      -
      +

      {% blocktrans trimmed %} YouTube should enhance its data access tools. YouTube should provide researchers with access to better tools that allow them to assess the signals that impact YouTube’s algorithm. {% endblocktrans %}

      -
      +

      {% blocktrans trimmed %} Policymakers should protect public interest researchers. Policymakers should pass and/or clarify laws that provide legal protections for public interest research. diff --git a/network-api/networkapi/wagtailpages/templates/wagtailpages/pages/youtube_regrets_reporter_page.html b/network-api/networkapi/wagtailpages/templates/wagtailpages/pages/youtube_regrets_reporter_page.html index 3a0184aaa03..0d9b6132fee 100644 --- a/network-api/networkapi/wagtailpages/templates/wagtailpages/pages/youtube_regrets_reporter_page.html +++ b/network-api/networkapi/wagtailpages/templates/wagtailpages/pages/youtube_regrets_reporter_page.html @@ -30,14 +30,14 @@

      {% trans "How it Works" %}

      - +

      1 {% trans "Click the frowning extension icon in the browser bar" %}

      - +

      2 {% trans "Report the video and recommendations that led you to it" %} @@ -48,7 +48,7 @@

      {% trans "How it Works" %}

      {% endif %}
      - +

      3 {% trans "Send any extra details you would like Mozilla to know" %} diff --git a/network-api/networkapi/wagtailpages/templates/wagtailpages/tags/card-large.html b/network-api/networkapi/wagtailpages/templates/wagtailpages/tags/card-large.html index 504d64a250c..ed4e72c4b37 100644 --- a/network-api/networkapi/wagtailpages/templates/wagtailpages/tags/card-large.html +++ b/network-api/networkapi/wagtailpages/templates/wagtailpages/tags/card-large.html @@ -3,10 +3,10 @@

      {% image image fill-1080x600-c100 format-jpeg as hero %} - + {% image image fill-600x600-c100 format-jpeg as hero2 %} - +

      {{ title }}

      diff --git a/network-api/networkapi/wagtailpages/templates/wagtailpages/tags/card.html b/network-api/networkapi/wagtailpages/templates/wagtailpages/tags/card.html index 68070957c17..ef8d1975b5f 100644 --- a/network-api/networkapi/wagtailpages/templates/wagtailpages/tags/card.html +++ b/network-api/networkapi/wagtailpages/templates/wagtailpages/tags/card.html @@ -2,7 +2,7 @@
      - +