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

Refresh: use Firefox brand fonts on some Firefox pages [fix #15542] #15569

Merged
merged 1 commit into from
Dec 3, 2024
Merged

Refresh: use Firefox brand fonts on some Firefox pages [fix #15542] #15569

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 10 additions & 0 deletions bedrock/firefox/templates/firefox/built-for-you/landing.de.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,16 @@
{% block page_desc %}Keine Kompromisse, bei den Dingen, die dir wichtig sind: Sicherheit, Produktivität und die Freiheit, so zu sein, wie du willst – mit Firefox.{% endblock %}
{% block page_image %}{{ static('img/firefox/built-for-you/meta-de.jpg') }}{% endblock %}

{% block site_css %}
{% if switch('m24-website-refresh') and ftl_file_is_active('navigation_refresh') and ftl_file_is_active('footer-refresh') %}
{{ css_bundle('m24-root') }}
{{ css_bundle('m24-navigation-and-footer') }}
{% else %}
{{ css_bundle('legacy-navigation-and-footer') }}
{% endif %}
{{ css_bundle('protocol-firefox') }}
{% endblock %}

{% block page_css %}
{{ css_bundle('protocol-split') }}
{{ css_bundle('protocol-card') }}
Expand Down
10 changes: 10 additions & 0 deletions bedrock/firefox/templates/firefox/built-for-you/landing.fr.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,16 @@
{% block page_desc %}Ne fais plus de compromis sur ce qui compte pour toi : être en sécurité, plus productif et libre d’être qui tu veux, avec Firefox.{% endblock %}
{% block page_image %}{{ static('img/firefox/built-for-you/meta-fr.jpg') }}{% endblock %}

{% block site_css %}
{% if switch('m24-website-refresh') and ftl_file_is_active('navigation_refresh') and ftl_file_is_active('footer-refresh') %}
{{ css_bundle('m24-root') }}
{{ css_bundle('m24-navigation-and-footer') }}
{% else %}
{{ css_bundle('legacy-navigation-and-footer') }}
{% endif %}
{{ css_bundle('protocol-firefox') }}
{% endblock %}

{% block page_css %}
{{ css_bundle('protocol-split') }}
{{ css_bundle('protocol-card') }}
Expand Down
10 changes: 10 additions & 0 deletions bedrock/firefox/templates/firefox/challenge-the-default/landing-base.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,16 @@
{% block page_title_suffix %} — {{ ftl('firefox-home-mozilla') }}{% endblock %}
{% block page_desc %}{{ seo_desc }}{% endblock %}

{% block site_css %}
{% if switch('m24-website-refresh') and ftl_file_is_active('navigation_refresh') and ftl_file_is_active('footer-refresh') %}
{{ css_bundle('m24-root') }}
{{ css_bundle('m24-navigation-and-footer') }}
{% else %}
{{ css_bundle('legacy-navigation-and-footer') }}
{% endif %}
{{ css_bundle('protocol-firefox') }}
{% endblock %}

{% block page_css %}
{{ css_bundle('protocol-picto') }}
{{ css_bundle('challenge-the-default') }}
Expand Down
10 changes: 10 additions & 0 deletions bedrock/firefox/templates/firefox/developer/firstrun.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,16 @@
{% block page_favicon_large %}{{ static('img/favicons/firefox/browser/developer/favicon-196x196.png') }}{% endblock %}
{% block page_ios_icon %}{{ static('img/favicons/firefox/browser/developer/apple-touch-icon.png') }}{% endblock %}

{% block site_css %}
{% if switch('m24-website-refresh') and ftl_file_is_active('navigation_refresh') and ftl_file_is_active('footer-refresh') %}
{{ css_bundle('m24-root') }}
{{ css_bundle('m24-navigation-and-footer') }}
{% else %}
{{ css_bundle('legacy-navigation-and-footer') }}
{% endif %}
{{ css_bundle('protocol-firefox') }}
{% endblock %}

{% block page_css %}
{{ css_bundle('protocol-split') }}
{{ css_bundle('firefox_developer') }}
Expand Down
10 changes: 10 additions & 0 deletions bedrock/firefox/templates/firefox/developer/whatsnew.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,16 @@
{% block page_favicon_large %}{{ static('img/favicons/firefox/browser/developer/favicon-196x196.png') }}{% endblock %}
{% block page_ios_icon %}{{ static('img/favicons/firefox/browser/developer/apple-touch-icon.png') }}{% endblock %}

{% block site_css %}
{% if switch('m24-website-refresh') and ftl_file_is_active('navigation_refresh') and ftl_file_is_active('footer-refresh') %}
{{ css_bundle('m24-root') }}
{{ css_bundle('m24-navigation-and-footer') }}
{% else %}
{{ css_bundle('legacy-navigation-and-footer') }}
{% endif %}
{{ css_bundle('protocol-firefox') }}
{% endblock %}

{% block page_css %}
{{ css_bundle('protocol-split') }}
{{ css_bundle('firefox_developer') }}
Expand Down
10 changes: 10 additions & 0 deletions bedrock/firefox/templates/firefox/family/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,16 @@

{% extends "firefox/base/base-protocol.html" %}

{% block site_css %}
{% if switch('m24-website-refresh') and ftl_file_is_active('navigation_refresh') and ftl_file_is_active('footer-refresh') %}
{{ css_bundle('m24-root') }}
{{ css_bundle('m24-navigation-and-footer') }}
{% else %}
{{ css_bundle('legacy-navigation-and-footer') }}
{% endif %}
{{ css_bundle('protocol-firefox') }}
{% endblock %}

{% block page_css %}
{{ css_bundle('protocol-card') }}
{{ css_bundle('firefox-family') }}
Expand Down
10 changes: 10 additions & 0 deletions bedrock/firefox/templates/firefox/nightly/firstrun.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,16 @@
{# "noindex" pages should not have the canonical or hreflang tags: bug 1442331 #}
{% block canonical_urls %}<meta name="robots" content="noindex,follow">{% endblock %}

{% block site_css %}
{% if switch('m24-website-refresh') and ftl_file_is_active('navigation_refresh') and ftl_file_is_active('footer-refresh') %}
{{ css_bundle('m24-root') }}
{{ css_bundle('m24-navigation-and-footer') }}
{% else %}
{{ css_bundle('legacy-navigation-and-footer') }}
{% endif %}
{{ css_bundle('protocol-firefox') }}
{% endblock %}

{% block page_css %}
{{ css_bundle('protocol-picto') }}
{{ css_bundle('protocol-callout') }}
Expand Down
10 changes: 10 additions & 0 deletions bedrock/firefox/templates/firefox/nightly/whatsnew.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,16 @@
{# "noindex" pages should not have the canonical or hreflang tags: bug 1442331 #}
{% block canonical_urls %}<meta name="robots" content="noindex,follow">{% endblock %}

{% block site_css %}
{% if switch('m24-website-refresh') and ftl_file_is_active('navigation_refresh') and ftl_file_is_active('footer-refresh') %}
{{ css_bundle('m24-root') }}
{{ css_bundle('m24-navigation-and-footer') }}
{% else %}
{{ css_bundle('legacy-navigation-and-footer') }}
{% endif %}
{{ css_bundle('protocol-firefox') }}
{% endblock %}

{% block page_css %}
{{ css_bundle('protocol-emphasis-box') }}
{{ css_bundle('protocol-callout') }}
Expand Down
10 changes: 10 additions & 0 deletions bedrock/firefox/templates/firefox/nothing-personal/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,16 @@

{% from "firefox/nothing-personal/includes/browser-macro.html" import browser_border %}

{% block site_css %}
{% if switch('m24-website-refresh') and ftl_file_is_active('navigation_refresh') and ftl_file_is_active('footer-refresh') %}
{{ css_bundle('m24-root') }}
{{ css_bundle('m24-navigation-and-footer') }}
{% else %}
{{ css_bundle('legacy-navigation-and-footer') }}
{% endif %}
{{ css_bundle('protocol-firefox') }}
{% endblock %}

{% block page_css %}
{{ css_bundle('firefox-nothing-personal') }}
{{ css_bundle('protocol-newsletter') }}
Expand Down
10 changes: 10 additions & 0 deletions bedrock/firefox/templates/firefox/welcome/base.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,16 @@
{# "noindex" pages should not have the canonical or hreflang tags: bug 1442331 #}
{% block canonical_urls %}<meta name="robots" content="noindex,follow">{% endblock %}

{% block site_css %}
{% if switch('m24-website-refresh') and ftl_file_is_active('navigation_refresh') and ftl_file_is_active('footer-refresh') %}
{{ css_bundle('m24-root') }}
{{ css_bundle('m24-navigation-and-footer') }}
{% else %}
{{ css_bundle('legacy-navigation-and-footer') }}
{% endif %}
{{ css_bundle('protocol-firefox') }}
{% endblock %}

{% block page_css %}
{{ css_bundle('firefox_welcome') }}
{% endblock %}
Expand Down
10 changes: 10 additions & 0 deletions bedrock/firefox/templates/firefox/whatsnew/base.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,16 @@
{% block page_title %}{{ ftl('whatsnew-page-title-v2') }}{% endblock %}
{% block page_desc %}{{ ftl('whatsnew-page-description') }}{% endblock %}

{% block site_css %}
{% if switch('m24-website-refresh') and ftl_file_is_active('navigation_refresh') and ftl_file_is_active('footer-refresh') %}
{{ css_bundle('m24-root') }}
{{ css_bundle('m24-navigation-and-footer') }}
{% else %}
{{ css_bundle('legacy-navigation-and-footer') }}
{% endif %}
{{ css_bundle('protocol-firefox') }}
{% endblock %}

{% block body_id %}firefox-whatsnew{% endblock %}

{% block site_header %}{% endblock %}
Expand Down
16 changes: 10 additions & 6 deletions media/css/firefox/developer/whatsnew-mdnplus.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,16 @@ $image-path: '/media/protocol/img';
@import '~@mozilla-protocol/core/protocol/css/components/logos/wordmark-product-developer';

.firefox-developer-whatsnew-mdnplus {
h1,
h2,
h3,
h4 {
@include font-base;
color: $color-black;
.c-mdn-header,
.c-mdn-body,
.c-mdn-footer {
h1,
h2,
h3,
h4 {
@include font-base;
color: $color-black;
}
}
}

Expand Down
5 changes: 5 additions & 0 deletions media/css/m24/components/footer-refresh.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -263,6 +263,11 @@ $max-footer-content-width: $content-max;
text-align: center;
max-width: 800px;

&:link,
&:visited {
text-decoration: none;
}

&:hover,
&:visited:hover {
background-color: $m24-color-black;
Expand Down
16 changes: 16 additions & 0 deletions media/css/m24/components/navigation-refresh.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -357,6 +357,13 @@ $margin-top: 54px; // top margin offset for mobile navigation menu
text-decoration: none;
width: 100%;

// extra specificity to override link colors on some Firefox pages
&:link,
&:visited {
color: $color-black;
text-decoration: none;
}

.m24-c-menu-title-icon {
@include bidi(((margin, 0 8px 0 0, 0 0 0 8px),));
}
Expand Down Expand Up @@ -443,6 +450,7 @@ $margin-top: 54px; // top margin offset for mobile navigation menu
text-decoration: none;
width: 100%;

&:link,
&:visited {
text-decoration: none;
}
Expand All @@ -457,6 +465,8 @@ $margin-top: 54px; // top margin offset for mobile navigation menu
.m24-c-menu-item .m24-c-menu-item-link
.m24-c-menu-item .m24-c-menu-item-link:link,
.m24-c-menu-item .m24-c-menu-item-link:visited {
text-decoration: none;

.m24-c-menu-item-title {
border: none;
}
Expand Down Expand Up @@ -605,13 +615,19 @@ $margin-top: 54px; // top margin offset for mobile navigation menu
border: none;
font-weight: 600;
position: relative;
text-decoration: none;
}
}

.mzp-has-icon.m24-c-menu-item .m24-c-menu-item-link:hover,
.mzp-has-icon.m24-c-menu-item .m24-c-menu-item-link:visited:hover {
.m24-c-menu-item-title {
border: none;
text-decoration: none;

&::after {
background: $m24-color-dark-green;
}
}
}

Expand Down
5 changes: 5 additions & 0 deletions media/css/m24/components/pencil-banner.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,11 @@
color: $m24-color-black;
margin-bottom: 0;
}

:link,
:visited {
color: $m24-color-black;
}
}

.m24-pencil-banner-close {
Expand Down
Loading