Skip to content

Commit

Permalink
Fix - Remove trailing slash from void elements (#11863)
Browse files Browse the repository at this point in the history
* Remove trailing slashes from self closing elements

* Remove remaining trailing slashes on void elements

---------

Co-authored-by: Ben Morse <ben.morse@torchbox.com>
Co-authored-by: Mavis Ou <mmmavis@users.noreply.github.com>
  • Loading branch information
3 people committed Feb 20, 2024
1 parent 4abf839 commit 087d391
Show file tree
Hide file tree
Showing 47 changed files with 91 additions and 91 deletions.
2 changes: 1 addition & 1 deletion maintenance/maintenance.html
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ <h5 class="tw-h5-heading">More about us</h5>
</div>
<div class="row">
<div class="col-12">
<hr class="mt-5 mb-3" />
<hr class="mt-5 mb-3">
<p class="dark-theme tw-body-small mb-0">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 <a href="https://foundation.mozilla.org">foundation.mozilla.org</a>. Most content available under a <a href="https://foundation.mozilla.org/about/website-licensing/">Creative Commons license</a>.</p>
</div>
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
<div class="tw-absolute tw-bg-black tw-opacity-25 tw-inset-0 tw-w-full tw-h-full"></div>
{# Play Icon #}
<img src="{% static "_images/mozfest/play-circle-grey.svg" %}"
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=""/>
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="">
</span>
</button>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
{% if card.link_page or card.link_url %}
<a href="{% if card.link_page %}{% pageurl card.link_page %}{% elif card.link_url %}{{ card.link_url }}{% endif %}" aria-label="{{ card.title }}">
{% endif %}
<img width="720" height="405" src="{{ img.url }}" alt="{{ card.alt_text }}"/>
<img width="720" height="405" src="{{ img.url }}" alt="{{ card.alt_text }}">
{% if card.link_page or card.link_url %}
</a>
{% endif %}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<div id="best-and-worst-products" class="tw-bg-gradient-to-b tw-from-white tw-via-red-05 tw-to-white">
<div class="tw-container tw-relative {{ wrapper_class }}">
<div class="tw-absolute tw-left-1/2 -tw-translate-x-1/2 -tw-translate-y-[120px] tw-w-[120px] tw-h-[120px] medium:tw-w-[330px] medium:tw-h-[330px] medium:-tw-top-[190px] medium:-tw-left-10 medium:tw-translate-x-0 medium:tw-translate-y-0">
<img width="100%" height="100%" alt="" src="{% static "_images/buyers-guide/consumer-creepometer/face-4.svg" %}" />
<img width="100%" height="100%" alt="" src="{% static "_images/buyers-guide/consumer-creepometer/face-4.svg" %}">
{% 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%]" %}
</div>
<div class="tw-row tw-px-8 tw-mt-8 medium:tw-mt-0">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,13 @@ <h3 class="{{ h2_class }} tw-mb-9">Products are getting more secure, but also a
<div class="tw-col-span-2 medium:tw-col-span-1 tw-flex tw-flex-col tw-justify-between">
<p class="{{ body_large_class }} tw-font-light">The mental health app BetterHelp shares your data with advertisers, social media platforms, and sister companies.</p>
<a class="{{ logo_class }} tw-mb-9 medium:tw-mb-0" href="https://foundation.mozilla.org/privacynotincluded/betterhelp/" target="_blank" aria-label="read more about BetterHelp">
<img width="100%" height="100%" src="{% static '_images/buyers-guide/consumer-creepometer/products/BetterHelp.png' %}" alt="BetterHelp logo" />
<img width="100%" height="100%" src="{% static '_images/buyers-guide/consumer-creepometer/products/BetterHelp.png' %}" alt="BetterHelp logo">
</a>
</div>
<div class="tw-col-span-2 medium:tw-col-span-1 tw-flex tw-flex-col tw-justify-between">
<p class="{{ body_large_class }} tw-font-light">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. </p>
<a class="{{ logo_class }} tw-mb-9 medium:tw-mb-0" href="https://foundation.mozilla.org/privacynotincluded/nissan/" target="_blank" aria-label="read more about Nissan">
<img width="100%" height="100%" src="{% static '_images/buyers-guide/consumer-creepometer/products/Nissan.png' %}" alt="Nissan logo" />
<img width="100%" height="100%" src="{% static '_images/buyers-guide/consumer-creepometer/products/Nissan.png' %}" alt="Nissan logo">
</a>
</div>
</div>
Expand All @@ -40,7 +40,7 @@ <h3 class="{{ h2_class }} tw-mb-9">An increasing number of products can’t be u
<p class="{{ body_large_class }} tw-font-bold tw-mb-9">For example:</p>
<p class="{{ body_large_class }} tw-font-light">The Verizon GizmoWatch is a product for kids, but all of its features — even simple to-do lists — require an internet connection.</p>
<a class="{{ logo_class }} tw-mb-9 medium:tw-mb-0" href="https://foundation.mozilla.org/privacynotincluded/verizon-gizmowatch/" target="_blank" >
<img width="100%" height="100%" src="{% static '_images/buyers-guide/consumer-creepometer/products/Verizon_Gizmowatch.png' %}" alt="Verizon Gizmowatch" />
<img width="100%" height="100%" src="{% static '_images/buyers-guide/consumer-creepometer/products/Verizon_Gizmowatch.png' %}" alt="Verizon Gizmowatch">
</a>
</div>
</div>
Expand All @@ -53,7 +53,7 @@ <h3 class="{{ h2_class }} tw-mb-9">Privacy policies are getting ridiculous.</h3>
<p class="{{ body_large_class }} tw-font-bold tw-mb-9">For example:</p>
<p class="{{ body_large_class }} tw-font-light">Car manufacturer Toyota has more than 10 different privacy policy documents — an unreasonable number for consumers to engage with.</p>
<a class="{{ logo_class }} medium:tw-mb-0" href="https://foundation.mozilla.org/privacynotincluded/toyota/" target="_blank" aria-label="read more about Toyota" >
<img width="100%" height="100%" src="{% static '_images/buyers-guide/consumer-creepometer/products/Toyota.png' %}" alt="Toyota logo" />
<img width="100%" height="100%" src="{% static '_images/buyers-guide/consumer-creepometer/products/Toyota.png' %}" alt="Toyota logo">
</a>
</div>
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<div id="by-the-numbers" class="tw-bg-gradient-to-b tw-from-white tw-via-blue-10 tw-to-white">
<div class="tw-container tw-relative {{ wrapper_class }}">
<div class="tw-absolute tw-left-1/2 -tw-translate-x-1/2 -tw-translate-y-[140px] tw-w-[130px] tw-h-[130px] medium:tw-w-[280px] medium:tw-h-[280px] medium:-tw-top-[160px] medium:tw-left-[85%] medium:tw-translate-x-0 medium:tw-translate-y-0">
<img width="100%" height="100%" alt="" src="{% static "_images/buyers-guide/consumer-creepometer/face-5.svg" %}" />
<img width="100%" height="100%" alt="" src="{% static "_images/buyers-guide/consumer-creepometer/face-5.svg" %}">
{% 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%]" %}
</div>
<div class="tw-row tw-px-8 tw-mt-8 medium:tw-mt-0">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<div class="tw-container tw-relative tw-pt-40 medium:tw-pt-0 tw-mt-[15px] medium:tw-mt-[60px]">
<div class="tw-absolute tw-top-0 medium:tw-bottom-0 medium:tw-left-0 medium:tw-right-0 tw-right-4 tw-w-[83px] tw-h-[79px] medium:tw-w-[327px] medium:tw-h-[313px] large:tw-w-[383px] large:tw-h-[367px]">
<div class="tw-relative medium:tw-left-[162%] large:tw-left-[200%] xlarge:tw-left-[250%]">
<img width="100%" height="auto" alt="" src="{% static "_images/buyers-guide/consumer-creepometer/face-1.svg" %}" />
<img width="100%" height="auto" alt="" src="{% static "_images/buyers-guide/consumer-creepometer/face-1.svg" %}">
{% 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%]" %}
</div>
</div>
Expand All @@ -23,7 +23,7 @@ <h2 class="tw-font-light tw-font-zilla tw-text-[24px] tw-leading-[28px] medium:t
</div>
<div class="tw-container">
<div class="{{ face_container_class }} tw-relative">
<img class="tw-relative tw-z-[2]" width="100%" height="100%" alt="" src="{% static "_images/buyers-guide/consumer-creepometer/creepy-score.svg" %}" />
<img class="tw-relative tw-z-[2]" width="100%" height="100%" alt="" src="{% static "_images/buyers-guide/consumer-creepometer/creepy-score.svg" %}">
<div class="tw-z-[-1] {{ face_container_class }} tw-absolute tw-transform tw-top-1/2 tw-translate-x-[5px] -tw-translate-y-[calc(50%-8px)] tw-scale-[85%] tw-rounded-full tw-bg-gray-20"></div>
{% 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%]" %}
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<div id="share-progress-em" class="sp_227930 sp_em_large tw-hidden"></div>
<div class="tw-container">
<div class="tw-relative tw-mt-[-130px] tw-w-[130px] tw-h-[130px] medium:tw-ml-[-45px] medium:tw-mt-[-235px] medium:tw-w-[235px] medium:tw-h-[235px]">
<img width="100%" height="100%" alt="" src="{% static "_images/buyers-guide/consumer-creepometer/face-2.svg" %}" />
<img width="100%" height="100%" alt="" src="{% static "_images/buyers-guide/consumer-creepometer/face-2.svg" %}">
{% 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%]" %}
</div>
<div class="tw-flex tw-flex-col medium:tw-gap-8 medium:tw-flex-row">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<div class="tw-container tw-relative {{ wrapper_class }}">
<div class="tw-absolute tw-left-1/2 -tw-translate-x-1/2 -tw-translate-y-[120px] tw-w-[120px] tw-h-[120px] medium:tw-w-[260px] medium:tw-h-[260px] large:tw-w-[305px] large:tw-h-[305px] tw-top-48 medium:-tw-top-48 medium:-tw-left-64 medium:tw-translate-x-0 medium:tw-translate-y-0">
<img width="100%" height="auto" alt="" src="{% static "_images/buyers-guide/consumer-creepometer/face-6.svg" %}" />
<img width="100%" height="auto" alt="" src="{% static "_images/buyers-guide/consumer-creepometer/face-6.svg" %}">
{% 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%]" %}
</div>
<div class="tw-row tw-px-8 tw-mt-28 medium:tw-mt-0">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<div class="{{ wrapper_class }} tw-container">
<div class="tw-row tw-px-8 tw-justify-center tw-text-center">
<div class="tw-relative tw-mx-auto tw-mb-10 tw-mt-[-100px] tw-w-[130px] tw-h-[130px] medium:tw-mb-0 medium:tw-mt-[-200px] medium:tw-w-[235px] medium:tw-h-[235px]">
<img width="100%" height="100%" alt="" src="{% static "_images/buyers-guide/consumer-creepometer/face-3.svg" %}" />
<img width="100%" height="100%" alt="" src="{% static "_images/buyers-guide/consumer-creepometer/face-3.svg" %}">
{% 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%]" %}
</div>
<h2 class="{{ h2_class }} tw-w-5/6 tw-mb-12 medium:tw-mb-20">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.</h2>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
<source media="(min-width: 992px)" srcset="{{ img_large.url }}, {{ img_large_2x.url }} 2x" />
<source media="(min-width: 768px)" srcset="{{ img_medium.url }}, {{ img_medium_2x.url }} 2x" />
<source media="(max-width: 767px)" srcset="{{ img_small.url }}, {{ img_small_2x.url }} 2x" />
<img class="tw-w-full tw-h-full tw-object-cover" src="{{ img_small.url }}" alt="{{ img_small.alt_text }}" />
<img class="tw-w-full tw-h-full tw-object-cover" src="{{ img_small.url }}" alt="{{ img_small.alt_text }}">
</picture>
</div>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ <h1 class="tw-h4-heading medium:tw-h1-heading medium:tw-text-[34px] tw-mt-2 tw-m
<source src="{{ video_url }}" type="video/mp4">
</video>
<div class="tw-absolute tw-top-0 tw-left-0 tw-min-h-full tw-min-w-full tw-flex tw-justify-center tw-place-items-center">
<img class="play-button tw-h-32 tw-w-32 tw-opacity-75 hover:tw-opacity-100" src="{% static "_images/video_play_button.svg" %}" alt="{% trans "Play Button" context "icon description for screen readers" %}" />
<img class="play-button tw-h-32 tw-w-32 tw-opacity-75 hover:tw-opacity-100" src="{% static "_images/video_play_button.svg" %}" alt="{% trans "Play Button" context "icon description for screen readers" %}">
</div>
</div>
{% else %}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<a href="{% pageurl article %}" class="tw-text-black tw-flex hover:tw-text-blue-40 tw-items-center tw-no-underline">
{% if show_images %}
{% image article.get_meta_image fill-156x156 as img %}
<img src="{{ img.url }}" alt="{{ img.alt }}" class="tw-w-[78px] tw-h-[78px] tw-rounded-2xl tw-mr-8"/>
<img src="{{ img.url }}" alt="{{ img.alt }}" class="tw-w-[78px] tw-h-[78px] tw-rounded-2xl tw-mr-8">
{% endif %}

<span class="tw-font-sans tw-font-bold tw-text-lg tw-leading-5">{{ article.title }}</span>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ <h2 class="tw-mb-0 tw-font-zilla tw-text-[40px] tw-leading-[48px] tw-w-max">{% t
{% include "./arrow_link.html" with link_href=link_href link_text=link_text extra_classes="tw-text-xl" %}
</div>
</div>
<img src="{% static "_images/buyers-guide/emoji-eyes.png" %}" class="tw-absolute tw-bottom-0 tw-right-12 tw-hidden large:tw-block" />
<img src="{% static "_images/buyers-guide/emoji-eyes.png" %}" class="tw-absolute tw-bottom-0 tw-right-12 tw-hidden large:tw-block">

</div>
</div>
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<p class="tw-h4-heading d-inline-block tw-mb-2 medium:tw-my-0 group-hover:tw-underline">{{ update.title }}</p>
<span class="tw-text-blue-40 tw-text-xs tw-font-bold tw-uppercase tw-pt-0 medium:tw-pt-2 tw-pb-4 medium:tw-pb-2 tw-leading-5 tw-flex tw-no-underline">
{{ update.author }}
<img src="{% static "_images/buyers-guide/product-update-card-external-link.svg" %}" class="tw-ml-4" />
<img src="{% static "_images/buyers-guide/product-update-card-external-link.svg" %}" class="tw-ml-4">
</span>
<p class="tw-text-xs medium:tw-text-lg tw-body tw-line-clamp-3 tw-leading-3 medium:tw-leading-6">{{ update.snippet }}</p>
</a>
Original file line number Diff line number Diff line change
Expand Up @@ -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"
/>
>
</a>

<a
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
alt=""
>
<input type="text" role="searchbox" id="product-filter-search-input" placeholder="{% trans "Search all products" %}" value=""
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" />
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">
<label for="product-filter-search-input" class="clear-icon">&nbsp;</label>
</div>
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ <h2 class="tw-mt-8 tw-body-large">
href="{{ download_file.url }}" download>
<img
src=" {% if page.download_button_icon %} {{ page.download_button_icon.url }} {% else %} {% static '_images/glyphs/download-file.svg' %} {% endif %}"
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 %}'/>
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 %}
<span class="tw-font-thin tw-ml-2">({{ download_file.file_size|filesizeformat }})</span>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ <h3 class="tw-h4-heading">{{ field.label_tag }}</h3>
{% if field.field.widget.input_type == "checkbox" %}
{% for pk, choice in field.field.widget.choices %}
<li class="tw-flex tw-flex-row tw-items-baseline ">
<input id="id_{{ field.name }}_{{ forloop.counter0 }}" name="{{ field.name }}" type="{{ field.field.widget.input_type }}" value="{{ pk }}" class="libraries-{{ field.field.widget.input_type }}" {% if pk|stringformat:"i" in field.value %}checked=""{% endif %}/>
<input id="id_{{ field.name }}_{{ forloop.counter0 }}" name="{{ field.name }}" type="{{ field.field.widget.input_type }}" value="{{ pk }}" class="libraries-{{ field.field.widget.input_type }}" {% if pk|stringformat:"i" in field.value %}checked=""{% endif %}>
<label for="id_{{ field.name }}_{{ forloop.counter0 }}" class="tw-pr-6 tw-overflow-hidden tw-break-words tw-hyphens-auto">
{{ choice }}
</label>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -56,5 +56,5 @@
{% endcomment %}
src="{{ img_1200.url }}"
alt=""
/>
>
</picture>
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ <h1 class="tw-h2-heading">
<details class="tw-w-full tw-font-sans tw-font-light tw-border-b tw-border-gray-20 tw-my-14">
<summary class="tw-list-none [&::-webkit-details-marker]:tw-hidden tw-w-full tw-text-lg tw-leading-7 tw-min-h-40 py-3 d-flex align-items-center tw-border-gray-20 tw-border-t">
<span class="tw-mr-auto">{% trans "Are you a journalist researching connected products or a member of the press covering privacy?" %}</span>
<img src="{% static "_images/plus-circle.svg" %}" alt="" data-state="open" class="summary-open:tw-hidden" />
<img src="{% static "_images/minus-circle.svg" %}" alt="" data-state="close" class="tw-hidden summary-open:tw-block" />
<img src="{% static "_images/plus-circle.svg" %}" alt="" data-state="open" class="summary-open:tw-hidden">
<img src="{% static "_images/minus-circle.svg" %}" alt="" data-state="close" class="tw-hidden summary-open:tw-block">
</summary>
<p class="tw-body">
{% blocktrans with pni_url="https://foundation.mozilla.org/privacynotincluded/" trimmed %}
Expand Down
Loading

0 comments on commit 087d391

Please sign in to comment.