From abb23ec9ccfca98e300b773c896c644081665b40 Mon Sep 17 00:00:00 2001 From: Jan Brasna <1784648+janbrasna@users.noreply.github.com> Date: Sun, 18 May 2025 16:56:13 +0200 Subject: [PATCH 1/3] Update Mozilla logo to current lockup --- assets/less/new/components/footer.less | 16 ++-------------- media/svg/Mozilla_Logo.svg | 4 ++-- media/svg/mozilla-logo-wordmark.svg | 2 -- .../includes/base/footer.html | 1 - .../thunderbird/128.0/apr25/index.html | 1 - 5 files changed, 4 insertions(+), 20 deletions(-) delete mode 100644 media/svg/mozilla-logo-wordmark.svg diff --git a/assets/less/new/components/footer.less b/assets/less/new/components/footer.less index 37eb0a387..683913344 100644 --- a/assets/less/new/components/footer.less +++ b/assets/less/new/components/footer.less @@ -22,18 +22,12 @@ footer { display: flex; gap: 30px; flex-wrap: wrap; - justify-content: center; -} - -.legal-links { font-size: 1rem; } - - -.mozilla-logo { +.mozilla-logo svg { --accent: white; - max-width: 200px; + max-width: 10rem; } #footer { @@ -45,10 +39,4 @@ footer { min-height: 10rem; display: flex; justify-content: center; - - - .mzla { - justify-content: flex-start; - align-content: center; - } } \ No newline at end of file diff --git a/media/svg/Mozilla_Logo.svg b/media/svg/Mozilla_Logo.svg index 2e3ccc815..a3c603f51 100644 --- a/media/svg/Mozilla_Logo.svg +++ b/media/svg/Mozilla_Logo.svg @@ -1,3 +1,3 @@ - - + + diff --git a/media/svg/mozilla-logo-wordmark.svg b/media/svg/mozilla-logo-wordmark.svg deleted file mode 100644 index 6f679a6dc..000000000 --- a/media/svg/mozilla-logo-wordmark.svg +++ /dev/null @@ -1,2 +0,0 @@ - - diff --git a/sites/updates.thunderbird.net/includes/base/footer.html b/sites/updates.thunderbird.net/includes/base/footer.html index 92cdaf8b9..b7c15cd8a 100644 --- a/sites/updates.thunderbird.net/includes/base/footer.html +++ b/sites/updates.thunderbird.net/includes/base/footer.html @@ -1,4 +1,3 @@ -{% set use_new_mozilla_logo = use_new_mozilla_logo|default(False) %}
diff --git a/sites/updates.thunderbird.net/thunderbird/128.0/apr25/index.html b/sites/updates.thunderbird.net/thunderbird/128.0/apr25/index.html index f6278861c..4b1738e65 100644 --- a/sites/updates.thunderbird.net/thunderbird/128.0/apr25/index.html +++ b/sites/updates.thunderbird.net/thunderbird/128.0/apr25/index.html @@ -8,7 +8,6 @@ #} {% set active_page = "appeal-apr25" %} -{% set use_new_mozilla_logo = True %} {# For donation url generation #} {% set fru_form_id = fru_form_id|default('apr25') %} From 96d916119b7aca29eaca6be7d150e3b34830870f Mon Sep 17 00:00:00 2001 From: Jan Brasna <1784648+janbrasna@users.noreply.github.com> Date: Sun, 26 Oct 2025 12:03:13 +0100 Subject: [PATCH 2/3] Align appeal/whatsnew footers --- assets/less/appeal-128.less | 12 ++---------- assets/less/new/components/appeal-footer.less | 17 ++--------------- media/css/appeal/spring24.css | 12 ++---------- 3 files changed, 6 insertions(+), 35 deletions(-) diff --git a/assets/less/appeal-128.less b/assets/less/appeal-128.less index da1ca8da8..823cab9ce 100644 --- a/assets/less/appeal-128.less +++ b/assets/less/appeal-128.less @@ -365,17 +365,9 @@ main { text-decoration-color: var(--color-purple-50); } -#footer .mzla { - display: grid; - place-items: center; - gap: 15px; - text-align: center; - max-inline-size: 75ch; -} - -#footer .mozilla-logo { +#footer .mozilla-logo svg { --accent: white; - max-width: 200px; + max-width: 10rem; } #footer .site-links, diff --git a/assets/less/new/components/appeal-footer.less b/assets/less/new/components/appeal-footer.less index 8e202cda6..2e113d200 100644 --- a/assets/less/new/components/appeal-footer.less +++ b/assets/less/new/components/appeal-footer.less @@ -34,22 +34,9 @@ text-decoration-color: var(--color-purple-50); } -#footer .mzla { - display: grid; - place-items: center; - gap: 0.9375rem; - text-align: center; - max-inline-size: 75ch; -} - -#footer .mozilla-logo { +#footer .mozilla-logo svg { --accent: white; - width: 7.6875rem; - max-width: 100%; - svg { - width: 100%; - height: 100%; - } + max-width: 10rem; } #footer .site-links, diff --git a/media/css/appeal/spring24.css b/media/css/appeal/spring24.css index 25720c159..7d061975c 100644 --- a/media/css/appeal/spring24.css +++ b/media/css/appeal/spring24.css @@ -779,17 +779,9 @@ main { text-decoration-color: var(--color-purple-50); } -#footer .mzla { - display: grid; - place-items: center; - gap: 15px; - text-align: center; - max-inline-size: 75ch; -} - -#footer .mozilla-logo { +#footer .mozilla-logo svg { --accent: white; - max-width: 200px; + max-width: 10rem; } #footer .site-links, From a19b6db869f1d7a583d1987084d73e6a52ba5252 Mon Sep 17 00:00:00 2001 From: Jan Brasna <1784648+janbrasna@users.noreply.github.com> Date: Sun, 18 May 2025 17:13:08 +0200 Subject: [PATCH 3/3] Use the same logo for updates --- assets/less/new/components/updates-footer.less | 7 ++----- sites/updates.thunderbird.net/includes/base/footer.html | 6 +++--- .../thunderbird/140.0/jun25a/index.html | 1 - .../thunderbird/140.0/jun25b/index.html | 1 - .../thunderbird/140.0/whatsnew/index.html | 1 - sites/www.thunderbird.net/includes/appeal-footer.html | 4 ++-- sites/www.thunderbird.net/includes/base/footer.html | 2 +- 7 files changed, 8 insertions(+), 14 deletions(-) diff --git a/assets/less/new/components/updates-footer.less b/assets/less/new/components/updates-footer.less index 173a9ef57..61b59822d 100644 --- a/assets/less/new/components/updates-footer.less +++ b/assets/less/new/components/updates-footer.less @@ -14,12 +14,9 @@ color: var(--color-gray-20); } - .mozilla-logo { + .mozilla-logo svg { --accent: white; - } - - .mzla, .mozilla-logo { - max-height: 12.625rem; + max-width: 10rem; } .mzla, .legal-links, .footer-inner { diff --git a/sites/updates.thunderbird.net/includes/base/footer.html b/sites/updates.thunderbird.net/includes/base/footer.html index b7c15cd8a..dd742c43a 100644 --- a/sites/updates.thunderbird.net/includes/base/footer.html +++ b/sites/updates.thunderbird.net/includes/base/footer.html @@ -1,8 +1,8 @@ \ No newline at end of file + diff --git a/sites/updates.thunderbird.net/thunderbird/140.0/jun25a/index.html b/sites/updates.thunderbird.net/thunderbird/140.0/jun25a/index.html index d2d0db385..ea48d5490 100644 --- a/sites/updates.thunderbird.net/thunderbird/140.0/jun25a/index.html +++ b/sites/updates.thunderbird.net/thunderbird/140.0/jun25a/index.html @@ -17,7 +17,6 @@ {% set utm_source = utm_source|default('new_tab') %} {% set utm_medium = utm_source|default('desktop') %} {% set donation_base_url = donation_base_url|default(url('updates.140.appeal.jun25a.donate')) %} -{% set use_new_mozilla_logo = True %} {# Disable the donation banner on this redirect page, we set this to false in the actual donation page. #} {% set disable_donation_blocked_notice = disable_donation_blocked_notice|default(True) %} diff --git a/sites/updates.thunderbird.net/thunderbird/140.0/jun25b/index.html b/sites/updates.thunderbird.net/thunderbird/140.0/jun25b/index.html index a1552d00a..ea1936fb5 100644 --- a/sites/updates.thunderbird.net/thunderbird/140.0/jun25b/index.html +++ b/sites/updates.thunderbird.net/thunderbird/140.0/jun25b/index.html @@ -14,7 +14,6 @@ {% set utm_source = utm_source|default('new_tab') %} {% set utm_medium = utm_source|default('desktop') %} {% set donation_base_url = donation_base_url|default(url('updates.140.appeal.jun25b.donate')) %} -{% set use_new_mozilla_logo = True %} {# Disable the donation banner on this redirect page, we set this to false in the actual donation page. #} {% set disable_donation_blocked_notice = disable_donation_blocked_notice|default(True) %} diff --git a/sites/updates.thunderbird.net/thunderbird/140.0/whatsnew/index.html b/sites/updates.thunderbird.net/thunderbird/140.0/whatsnew/index.html index 55c515cbb..3dd9000b5 100644 --- a/sites/updates.thunderbird.net/thunderbird/140.0/whatsnew/index.html +++ b/sites/updates.thunderbird.net/thunderbird/140.0/whatsnew/index.html @@ -4,7 +4,6 @@ {% set active_page = "whatsnew-140" %} {% set page_title_text = _('Thunderbird Eclipse') %} -{% set use_new_mozilla_logo = True %} {% extends "includes/base/base.html" %} {% block page_title %}{{ page_title_text }}{% endblock %} diff --git a/sites/www.thunderbird.net/includes/appeal-footer.html b/sites/www.thunderbird.net/includes/appeal-footer.html index 0c62ee257..ec2f87248 100644 --- a/sites/www.thunderbird.net/includes/appeal-footer.html +++ b/sites/www.thunderbird.net/includes/appeal-footer.html @@ -1,5 +1,5 @@
-
@@ -16,4 +16,4 @@ {{ _('Participation Guidelines') }}
-
\ No newline at end of file +
diff --git a/sites/www.thunderbird.net/includes/base/footer.html b/sites/www.thunderbird.net/includes/base/footer.html index f376403c8..0e81669ec 100644 --- a/sites/www.thunderbird.net/includes/base/footer.html +++ b/sites/www.thunderbird.net/includes/base/footer.html @@ -44,7 +44,7 @@

{{ _('Contribute') }}

-