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.

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

Misc a11y fixes #15186

Merged
merged 1 commit into from
Sep 20, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
#}

<div class="m24-c-transition m24-t-black"><hr></div>
<footer class="moz24-footer" id="colophon">
<footer class="moz24-footer" id="colophon" role="contentinfo">
{% if show_newsletter %}
{% include 'includes/protocol/footer/footer-newsletter.html' %}
{% endif %}
Expand Down
22 changes: 11 additions & 11 deletions bedrock/base/templates/includes/protocol/footer/footer.html
Original file line number Diff line number Diff line change
Expand Up @@ -9,17 +9,17 @@
{% if switch('m24-navigation-and-footer') and LANG.startswith('en-') %}
{% include 'includes/protocol/footer/footer-refresh.html' %}
{% else %}
<footer class="mzp-c-footer {% if theme_class %}{{ theme_class }}{% endif %}" id="colophon">
<footer class="mzp-c-footer {% if theme_class %}{{ theme_class }}{% endif %}" id="colophon" role="contentinfo">
<div class="mzp-l-content">
<nav class="mzp-c-footer-primary">
<div class="mzp-c-footer-primary-logo {% if switch('m24-logo') %}m24-logo{% endif %}">
<a href="{{ url('mozorg.home') }}" data-link-type="footer" data-link-text="Mozilla">{{ ftl('footer-mozilla') }}</a>
</div>
<div class="mzp-c-footer-sections">
<section class="mzp-c-footer-section">
<h5 class="mzp-c-footer-heading" data-testid="footer-heading-company">
<h2 class="mzp-c-footer-heading" data-testid="footer-heading-company">
{{ ftl('footer-company') }}
</h5>
</h2>
<ul class="mzp-c-footer-list" data-testid="footer-list-company">
<li><a href="{{ url('mozorg.about.manifesto') }}" data-link-type="footer" data-link-text="Mozilla Manifesto">{{ ftl('footer-mozilla-manifesto') }}</a></li>
<li><a href="https://blog.mozilla.org/category/mozilla/news/?{{ utm_params }}&utm_content=company" data-link-type="footer" data-link-text="Press Center">{{ ftl('footer-press-center') }}</a></li>
Expand All @@ -44,19 +44,19 @@ <h5 class="mzp-c-footer-heading" data-testid="footer-heading-company">
</section>

<section class="mzp-c-footer-section">
<h5 class="mzp-c-footer-heading" data-testid="footer-heading-resources">
<h2 class="mzp-c-footer-heading" data-testid="footer-heading-resources">
{{ ftl('footer-resources') }}
</h5>
</h2>
<ul class="mzp-c-footer-list" data-testid="footer-list-resources">
<li><a href="{{ url('privacy') }}" data-link-type="footer" data-link-text="Privacy Hub">{{ ftl('footer-privacy-hub', fallback='footer-privacy') }}</a></li>
<li><a href="https://mozilla.design/?{{ utm_params }}&utm_content=resources" data-link-type="footer" data-link-text="Brand Standards">{{ ftl('footer-brand-standards') }}</a></li>
</ul>
</section>

<section class="mzp-c-footer-section">
<h5 class="mzp-c-footer-heading" data-testid="footer-heading-support">
<h2 class="mzp-c-footer-heading" data-testid="footer-heading-support">
{{ ftl('footer-support') }}
</h5>
</h2>
<ul class="mzp-c-footer-list" data-testid="footer-list-support">
<li><a href="https://support.mozilla.org/?{{ utm_params }}&utm_content=support" data-link-type="footer" data-link-text="Product Help">{{ ftl('footer-product-help', fallback='footer-support') }}</a></li>
<li><a href="https://bugzilla.mozilla.org/?{{ utm_params }}&utm_content=support" data-link-type="footer" data-link-text="File a Bug">{{ ftl('footer-file-a-bug') }}</a></li>
Expand All @@ -65,9 +65,9 @@ <h5 class="mzp-c-footer-heading" data-testid="footer-heading-support">
</section>

<section class="mzp-c-footer-section">
<h5 class="mzp-c-footer-heading" data-testid="footer-heading-developers">
<h2 class="mzp-c-footer-heading" data-testid="footer-heading-developers">
{{ ftl('footer-developers') }}
</h5>
</h2>
<ul class="mzp-c-footer-list" data-testid="footer-list-developers">
<li><a href="{{ url('firefox.developer.index') }}" data-link-type="footer" data-link-text="Firefox Developer Edition">{{ ftl('footer-developer-edition') }}</a></li>
<li><a href="{{ url('firefox.channel.desktop') }}#beta" data-link-type="footer" data-link-text="Firefox Beta">{{ ftl('footer-beta') }}</a></li>
Expand All @@ -80,7 +80,7 @@ <h5 class="mzp-c-footer-heading" data-testid="footer-heading-developers">
</section>

<section class="mzp-c-footer-section">
<h5 class="mzp-c-footer-heading-social">{{ ftl('footer-follow-mozilla') }}</h5>
<h2 class="mzp-c-footer-heading-social">{{ ftl('footer-follow-mozilla') }}</h2>
<ul class="mzp-c-footer-links-social">
<li><a class="twitter" href="{{ mozilla_twitter_url() }}" data-link-type="footer" data-link-text="Twitter (@mozilla)">{{ ftl('footer-x-formerly-twitter', fallback='footer-twitter') }}<span> (@mozilla)</span></a></li>
<li><a class="mastodon" href="https://mozilla.social/@Mozilla" rel="me" data-link-type="footer" data-link-text="Mastodon (@mozilla)">{{ ftl('footer-mastodon') }}<span> (@mozilla)</span></a></li>
Expand All @@ -90,7 +90,7 @@ <h5 class="mzp-c-footer-heading-social">{{ ftl('footer-follow-mozilla') }}</h5>
<li><a class="spotify" href="https://open.spotify.com/show/0vT7LJMeVDxyQ2ZamHKu08?si=_uDRD6bRR_6M5YZyISGXgA" data-link-type="footer" data-link-text="Spotify (@mozilla)">{{ ftl('footer-spotify') }}<span> (@mozilla)</span></a></li>
</ul>

<h5 class="mzp-c-footer-heading-social">{{ ftl('footer-follow-firefox') }}</h5>
<h2 class="mzp-c-footer-heading-social">{{ ftl('footer-follow-firefox') }}</h2>
<ul class="mzp-c-footer-links-social">
<li><a class="twitter" href="{{ firefox_twitter_url() }}" data-link-type="footer" data-link-text="Twitter (@firefox)">{{ ftl('footer-x-formerly-twitter', fallback='footer-twitter') }}<span> (@firefox)</span></a></li>
<li><a class="instagram" href="https://www.instagram.com/firefox/" data-link-type="footer" data-link-text="Instagram (@firefox)">{{ ftl('footer-instagram') }}<span> (@firefox)</span></a></li>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,6 @@ <h2 class="mzp-u-title-md">Rase durchs Web</h2>
</div>
{{ download_firefox_thanks(download_location='speed-section', locale_in_transition=True) }}
</div>
</div>
{% endcall %}

<section class="mzp-c-callout section-choose">
Expand Down
14 changes: 7 additions & 7 deletions bedrock/mozorg/templates/mozorg/about/index-m24.html
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,11 @@
{% endblock %}

{% block content %}

{% include 'mozorg/about/includes/m24/hero.html'%}
{% include 'mozorg/about/includes/m24/amplify.html'%}
{% include 'mozorg/about/includes/m24/idea.html'%}
{% include 'mozorg/about/includes/m24/careers.html'%}
{% include 'mozorg/about/includes/m24/leadership.html'%}

<main>
{% include 'mozorg/about/includes/m24/hero.html'%}
{% include 'mozorg/about/includes/m24/amplify.html'%}
{% include 'mozorg/about/includes/m24/idea.html'%}
{% include 'mozorg/about/includes/m24/careers.html'%}
{% include 'mozorg/about/includes/m24/leadership.html'%}
</main>
{% endblock %}