Merge branch 'main' into upd/builders-url

mozilla · Dec 3, 2024 · 67a2291 · 67a2291
2 parents b9da0e0 + fb40fd0
commit 67a2291
Show file tree

Hide file tree

Showing 120 changed files with 739 additions and 289 deletions.
diff --git a/bedrock/base/templates/includes/banners/pencil-banner.html b/bedrock/base/templates/includes/banners/pencil-banner.html
@@ -8,7 +8,7 @@
 {# Exclude banners from search result snippets using `data-nosnippet` (issue 8739) #}
 <aside class="m24-pencil-banner" aria-label="{{ ftl('ui-promo-label') }}" data-nosnippet="true">
   <div class="m24-pencil-banner-copy">
-    {% set donate_url = 'href="https://foundation.mozilla.org/en/?form=donate-today" data-cta-type="link" data-cta-text="donate today"' %}
+    {% set donate_url = 'href="https://foundation.mozilla.org/?form=donate-today" data-cta-type="link" data-cta-text="donate today"' %}
     <p>{{ ftl('m24-pencil-banner-support-ethical', donate=donate_url) }}</p>
   </div>
   <button class="m24-pencil-banner-close" type="button">{{ ftl('ui-close') }}</button>

diff --git a/bedrock/base/templates/includes/protocol/navigation/menus-refresh/about-us.html b/bedrock/base/templates/includes/protocol/navigation/menus-refresh/about-us.html
@@ -64,7 +64,7 @@ <h4 class="m24-c-menu-item-title">{{ ftl('navigation-refresh-mozilla-foundation'
             </li>
             <li>
               <section class="m24-c-menu-item">
-                <a class="m24-c-menu-item-link" href="https://www.mozilla.ai/?{{ utm_params }}" data-link-text="Mozilla AI" data-link-position="topnav - about">
+                <a class="m24-c-menu-item-link" href="https://www.mozilla.ai/?{{ utm_params }}" data-link-text="Mozilla.ai" data-link-position="topnav - about">
                   <h4 class="m24-c-menu-item-title">{{ ftl('navigation-refresh-mozilla-ai-v2') }}</h4>
                 </a>
               </section>

diff --git a/bedrock/base/templates/includes/protocol/navigation/menus-refresh/products.html b/bedrock/base/templates/includes/protocol/navigation/menus-refresh/products.html
@@ -32,7 +32,7 @@ <h4 class="m24-c-menu-item-title">{{ ftl('navigation-refresh-mozilla-monitor-v2'
           <li>
             <section class="m24-c-menu-item mzp-has-icon">
               <a class="m24-c-menu-item-link" href="https://relay.firefox.com/?{{ utm_params }}" data-link-text="Firefox Relay" data-link-position="topnav - products">
-                <img loading="lazy" src="{{ static('protocol/img/logos/firefox/relay/logo.svg') }}" class="m24-c-menu-item-icon" width="32" height="32" alt="">
+                <img loading="lazy" src="{{ static('protocol/img/logos/firefox/relay/logo-white.svg') }}" class="m24-c-menu-item-icon" width="32" height="32" alt="">
                 <h4 class="m24-c-menu-item-title">{{ ftl('navigation-refresh-firefox-relay') }}</h4>
               </a>
             </section>
@@ -73,7 +73,9 @@ <h4 class="m24-c-menu-item-title">{{ ftl('navigation-refresh-thunderbird') }}</h
         <p class="m24-c-menu-category-link">
           <a href="{{ url('products.landing') }}" data-link-text="Go to all browsers and products" data-link-position="topnav - products">
             {{ ftl('navigation-refresh-all-products') }}
-            <svg fill="none" height="24" width="24" xmlns="http://www.w3.org/2000/svg"><clipPath id="a"><path d="M0 0h24v24H0z"/></clipPath><g clip-path="url(#a)"><path d="M10.45 10.789v1.806H5V10.79zm8.55.903L10.45 4.5v6.289h1.806v-2.41l3.938 3.313-3.938 3.312v-2.409H10.45v6.289z" fill="#fff"/></g></svg>
+            <svg xmlns="http://www.w3.org/2000/svg" xml:space="preserve" width="24" height="24" viewBox="0 0 23.4 24" fill="currentColor">
+              <path d="M23.4 12 9.1 0v10.5H0v3h9.1V24l14.3-12zm-11.3-1.5v-4l6.6 5.5-6.6 5.5v-7z"/>
+            </svg>
           </a>
         </p>
       </div>

diff --git a/bedrock/firefox/templates/firefox/built-for-you/landing.de.html b/bedrock/firefox/templates/firefox/built-for-you/landing.de.html
@@ -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') }}

diff --git a/bedrock/firefox/templates/firefox/built-for-you/landing.fr.html b/bedrock/firefox/templates/firefox/built-for-you/landing.fr.html
@@ -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') }}

diff --git a/bedrock/firefox/templates/firefox/challenge-the-default/landing-base.html b/bedrock/firefox/templates/firefox/challenge-the-default/landing-base.html
@@ -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') }}

diff --git a/bedrock/firefox/templates/firefox/developer/firstrun.html b/bedrock/firefox/templates/firefox/developer/firstrun.html
@@ -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') }}

diff --git a/bedrock/firefox/templates/firefox/developer/includes/for-developers.html b/bedrock/firefox/templates/firefox/developer/includes/for-developers.html
@@ -13,7 +13,7 @@
 ) %}
   <h2 class="mzp-u-title-xs">{{ ftl('firefox-developer-firefox-developer-edition') }}</h2>
   <h3 class="mzp-u-title-sm">{{ ftl('firefox-developer-made-for-developers') }}</h3>
-  <p>{{ ftl('firefox-developer-all-the-latest-v2', fallback='firefox-developer-all-the-latest') }}</p>
+  <p>{{ ftl('firefox-developer-all-the-latest-v2') }}</p>
   <p>{{ ftl('firefox-developer-a-separate-profile') }}</p>
   <p>{{ ftl('firefox-developer-preferences-tailored') }}</p>
 {% endcall %}
diff --git a/bedrock/firefox/templates/firefox/developer/whatsnew.html b/bedrock/firefox/templates/firefox/developer/whatsnew.html
@@ -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') }}

diff --git a/bedrock/firefox/templates/firefox/family/index.html b/bedrock/firefox/templates/firefox/family/index.html
@@ -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') }}

diff --git a/bedrock/firefox/templates/firefox/nightly/firstrun.html b/bedrock/firefox/templates/firefox/nightly/firstrun.html
@@ -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') }}

diff --git a/bedrock/firefox/templates/firefox/nightly/whatsnew.html b/bedrock/firefox/templates/firefox/nightly/whatsnew.html
@@ -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') }}

diff --git a/bedrock/firefox/templates/firefox/nothing-personal/index.html b/bedrock/firefox/templates/firefox/nothing-personal/index.html
@@ -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') }}

diff --git a/bedrock/firefox/templates/firefox/welcome/base.html b/bedrock/firefox/templates/firefox/welcome/base.html
@@ -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 %}

diff --git a/bedrock/firefox/templates/firefox/whatsnew/base.html b/bedrock/firefox/templates/firefox/whatsnew/base.html
@@ -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 %}

diff --git a/bedrock/mozorg/templates/mozorg/about/includes/m24/careers.html b/bedrock/mozorg/templates/mozorg/about/includes/m24/careers.html
@@ -16,10 +16,126 @@
 <div class="m24-c-careers">
   <h2 class="m24-c-careers-title">{{ ftl('m24-about-join-us-and') }}</h2>
   <div class="m24-c-careers-media">
-    {{ career_pic('careers1-2-3', 'careers1-1-1') }}
-    {{ career_pic('careers2-2-3', 'careers2-1-1') }}
-    {{ career_pic('careers3-2-3', 'careers3-1-1') }}
-    {{ career_pic('careers4-2-3', 'careers4-1-1') }}
+
+    {{ picture(
+        url="img/mozorg/about/m24/careers/careers-1-desktop-432.jpg",
+        sources=[
+          {
+            'media': '(max-width: 767px)',
+            'srcset': {
+              "img/mozorg/about/m24/careers/careers-1-mobile-375.jpg": "375w",
+              "img/mozorg/about/m24/careers/careers-1-mobile-432.jpg": "432w",
+            },
+            'sizes': {
+              "default": "calc(50vw - 16px)",
+            },
+          },
+          {
+            'srcset': {
+              "img/mozorg/about/m24/careers/careers-1-desktop-230.jpg": "230w",
+              "img/mozorg/about/m24/careers/careers-1-desktop-432.jpg": "432w",
+            },
+            'sizes': {
+              "(min-width: 1440px)": "432px",
+              "default": "calc(100vw - 64px / 6)",
+            },
+          },
+        ],
+        optional_attributes={
+          "loading": "lazy",
+          "alt": "",
+        }
+    ) }}
+    {{ picture(
+      url="img/mozorg/about/m24/careers/careers-2-desktop-432.jpg",
+      sources=[
+        {
+          'media': '(max-width: 767px)',
+          'srcset': {
+            "img/mozorg/about/m24/careers/careers-2-mobile-375.jpg": "375w",
+            "img/mozorg/about/m24/careers/careers-2-mobile-432.jpg": "432w",
+          },
+          'sizes': {
+            "default": "calc(50vw - 16px)",
+          },
+        },
+        {
+          'srcset': {
+            "img/mozorg/about/m24/careers/careers-2-desktop-230.jpg": "230w",
+            "img/mozorg/about/m24/careers/careers-2-desktop-432.jpg": "432w",
+          },
+          'sizes': {
+            "(min-width: 1440px)": "432px",
+            "default": "calc(100vw - 64px / 6)",
+          },
+        },
+      ],
+      optional_attributes={
+        "loading": "lazy",
+        "alt": "",
+      }
+  ) }}
+
+  {{ picture(
+    url="img/mozorg/about/m24/careers/careers-3-desktop-432.jpg",
+    sources=[
+      {
+        'media': '(max-width: 767px)',
+        'srcset': {
+          "img/mozorg/about/m24/careers/careers-3-mobile-375.jpg": "375w",
+          "img/mozorg/about/m24/careers/careers-3-mobile-432.jpg": "432w",
+        },
+        'sizes': {
+          "default": "calc(50vw - 16px)",
+        },
+      },
+      {
+        'srcset': {
+          "img/mozorg/about/m24/careers/careers-3-desktop-230.jpg": "230w",
+          "img/mozorg/about/m24/careers/careers-3-desktop-432.jpg": "432w",
+        },
+        'sizes': {
+          "(min-width: 1440px)": "432px",
+          "default": "calc(100vw - 64px / 6)",
+        },
+      },
+    ],
+    optional_attributes={
+      "loading": "lazy",
+      "alt": "",
+    }
+) }}
+
+{{ picture(
+  url="img/mozorg/about/m24/careers/careers-4-desktop-432.jpg",
+  sources=[
+    {
+      'media': '(max-width: 767px)',
+      'srcset': {
+        "img/mozorg/about/m24/careers/careers-4-mobile-375.jpg": "375w",
+        "img/mozorg/about/m24/careers/careers-4-mobile-432.jpg": "432w",
+      },
+      'sizes': {
+        "default": "calc(50vw - 16px)",
+      },
+    },
+    {
+      'srcset': {
+        "img/mozorg/about/m24/careers/careers-4-desktop-230.jpg": "230w",
+        "img/mozorg/about/m24/careers/careers-4-desktop-432.jpg": "432w",
+      },
+      'sizes': {
+        "(min-width: 1440px)": "432px",
+        "default": "calc(100vw - 64px / 6)",
+      },
+    },
+  ],
+  optional_attributes={
+    "loading": "lazy",
+    "alt": "",
+  }
+) }}
+
   </div>
   <p class="m24-consider-cta-info">{{ ftl('m24-about-join-our-team') }}</p>
   <div class="m24-c-careers-cta">