Update to Protocol 15.0.0, update logos and wordmarks (mozilla#10635)

Remove welcome page 5 for Lockwise.
Remove old Focus and Send logos.
Add logos for structured data.
Use new video component for video embeds.

bedrock/base/templates/base-error.html

@@ -16,7 +16,7 @@
   <div class="mzp-l-content">
     <div class="header-image">
       <a class="logo-mozilla" href="{{ url('mozorg.home') }}"><img src="{{ static('protocol/img/logos/mozilla/logo-word-hor.svg') }}" alt="{{ ftl('error-page-mozilla') }}" width="140"></a>
-      <a class="logo-firefox" href="{{ url('firefox') }}">{{ high_res_img('protocol/img/logos/firefox/logo-word-hor-sm.png', {'alt': ftl('error-page-firefox'), 'width':'140'}) }}</a>
+      <a class="logo-firefox" href="{{ url('firefox') }}"><img src="{{ static('protocol/img/logos/firefox/logo-word-hor.svg') }}" alt="{{ ftl('error-page-firefox') }}" width="140"></a>
     </div>
   </div>
 </header>

bedrock/base/templates/includes/protocol/navigation/menus/firefox.html

@@ -16,7 +16,7 @@
           <li>
             <section class="c-menu-item mzp-has-icon">
               <a class="c-menu-item-link" href="{{ url('firefox.new') }}" data-link-name="Firefox Desktop Browser" data-link-type="nav" data-link-position="topnav" data-link-group="firefox">
-                <img src="{{ static('protocol/img/logos/firefox/browser/logo-sm.png') }}" class="c-menu-item-icon" width="32" height="32" alt="" loading="lazy">
+                <img src="{{ static('protocol/img/logos/firefox/browser/logo.svg') }}" class="c-menu-item-icon" width="32" height="32" alt="" loading="lazy">
                 <h4 class="c-menu-item-title">{{ ftl('navigation-v2-firefox-for-desktop', fallback='navigation-firefox-browser-for-desktop') }}</h4>
                 <p class="c-menu-item-desc">{{ ftl('navigation-v2-get-the-not-for-profit-backed', fallback='navigation-get-the-browser-that-respects') }}</p>
               </a>
@@ -26,7 +26,7 @@ <h4 class="c-menu-item-title">{{ ftl('navigation-v2-firefox-for-desktop', fallba
           <li>
             <section class="c-menu-item mzp-has-icon">
               <a class="c-menu-item-link" href="{{ url('firefox.browsers.mobile.android') }}" data-link-name="Firefox for Android" data-link-type="nav" data-link-position="topnav" data-link-group="firefox">
-                <img src="{{ static('protocol/img/logos/firefox/browser/logo-sm.png') }}" class="c-menu-item-icon" width="32" height="32" alt="" loading="lazy">
+                <img src="{{ static('protocol/img/logos/firefox/browser/logo.svg') }}" class="c-menu-item-icon" width="32" height="32" alt="" loading="lazy">
                 <h4 class="c-menu-item-title">{{ ftl('navigation-v2-firefox-for-android') }}</h4>
                 <p class="c-menu-item-desc">{{ ftl('navigation-v2-get-the-customizable-mobile') }}</p>
               </a>
@@ -35,7 +35,7 @@ <h4 class="c-menu-item-title">{{ ftl('navigation-v2-firefox-for-android') }}</h4
           <li>
             <section class="c-menu-item mzp-has-icon">
               <a class="c-menu-item-link" href="{{ url('firefox.browsers.mobile.ios') }}" data-link-name="Firefox for iOS" data-link-type="nav" data-link-position="topnav" data-link-group="firefox">
-                <img src="{{ static('protocol/img/logos/firefox/browser/logo-sm.png') }}" class="c-menu-item-icon" width="32" height="32" alt="" loading="lazy">
+                <img src="{{ static('protocol/img/logos/firefox/browser/logo.svg') }}" class="c-menu-item-icon" width="32" height="32" alt="" loading="lazy">
                 <h4 class="c-menu-item-title">{{ ftl('navigation-v2-firefox-for-ios') }}</h4>
                 <p class="c-menu-item-desc">{{ ftl('navigation-v2-get-the-mobile-browser') }}</p>
               </a>
@@ -45,7 +45,7 @@ <h4 class="c-menu-item-title">{{ ftl('navigation-v2-firefox-for-ios') }}</h4>
           <li>
             <section class="c-menu-item mzp-has-icon">
               <a class="c-menu-item-link" href="{{ url('firefox.browsers.mobile.index') }}" data-link-name="Firefox for Mobile" data-link-type="nav" data-link-position="topnav" data-link-group="firefox">
-                <img src="{{ static('protocol/img/logos/firefox/browser/logo-sm.png') }}" class="c-menu-item-icon" width="32" height="32" alt="" loading="lazy">
+                <img src="{{ static('protocol/img/logos/firefox/browser/logo.svg') }}" class="c-menu-item-icon" width="32" height="32" alt="" loading="lazy">
                 <h4 class="c-menu-item-title">{{ ftl('navigation-firefox-browser-for-mobile') }}</h4>
                 <p class="c-menu-item-desc">{{ ftl('navigation-take-speed-privacy-and') }}</p>
               </a>
@@ -55,7 +55,7 @@ <h4 class="c-menu-item-title">{{ ftl('navigation-firefox-browser-for-mobile') }}
           <li>
             <section class="c-menu-item mzp-has-icon">
               <a class="c-menu-item-link" href="{{ url('firefox.browsers.mobile.focus') }}" data-link-name="Firefox Focus" data-link-type="nav" data-link-position="topnav" data-link-group="firefox">
-                <img src="{{ static('img/logos/firefox/focus-logo.svg') }}" class="c-menu-item-icon" width="32" height="32" alt="" loading="lazy">
+                <img src="{{ static('protocol/img/logos/firefox/browser/focus/logo.svg') }}" class="c-menu-item-icon" width="32" height="32" alt="" loading="lazy">
                 <h4 class="c-menu-item-title">{{ ftl('navigation-v2-firefox-focus') }}</h4>
                 <p class="c-menu-item-desc">{{ ftl('navigation-v2-simply-private-mobile') }}</p>
               </a>

bedrock/base/templates/includes/protocol/navigation/menus/innovation.html

@@ -25,7 +25,7 @@ <h4 class="c-menu-item-title">{{ ftl('navigation-v2-mozilla-hubs') }}</h4>
           <li>
             <section class="c-menu-item mzp-has-icon">
               <a class="c-menu-item-link" href="{{ url('firefox.developer.index') }}" data-link-name="Firefox Developer Edition" data-link-type="nav" data-link-position="topnav" data-link-group="innovation">
-                <img src="{{ static('protocol/img/logos/firefox/browser/developer/logo-sm.png') }}" class="c-menu-item-icon" width="32" height="32" alt="" loading="lazy">
+                <img src="{{ static('protocol/img/logos/firefox/browser/developer/logo.svg') }}" class="c-menu-item-icon" width="32" height="32" alt="" loading="lazy">
                 <h4 class="c-menu-item-title">{{ ftl('navigation-v2-firefox-developer-edition', fallback='navigation-firefox-developer-edition') }}</h4>
                 <p class="c-menu-item-desc">{{ ftl('navigation-v2-get-the-firefox-browser-built', fallback='navigation-firefox-built-just-for') }}</p>
               </a>

bedrock/base/templates/includes/protocol/navigation/menus/products.html

@@ -16,7 +16,7 @@
           <li>
             <section class="c-menu-item mzp-has-icon">
               <a class="c-menu-item-link" href="https://monitor.firefox.com/?{{ utm_params }}" data-link-name="Firefox Monitor" data-link-type="nav" data-link-position="topnav" data-link-group="products">
-                <img src="{{ static('protocol/img/logos/firefox/monitor/logo-sm.png') }}" class="c-menu-item-icon" width="32" height="32" alt="" loading="lazy">
+                <img src="{{ static('protocol/img/logos/firefox/monitor/logo.svg') }}" class="c-menu-item-icon" width="32" height="32" alt="" loading="lazy">
                 <h4 class="c-menu-item-title">{{ ftl('navigation-v2-firefox-monitor', fallback='navigation-firefox-monitor') }}</h4>
                 <p class="c-menu-item-desc">{{ ftl('navigation-v2-see-if-your-email-has', fallback='navigation-see-if-your-personal') }}</p>
               </a>

bedrock/base/templates/includes/structured-data/organizations/mozilla-corporation-organisation.json

@@ -35,7 +35,7 @@
     "@type": "brand",
     "@id": "{{ structured_data_id('firefoxbrand') }}",
     "url": "{% filter absolute_url %}{{ url('firefox') }}{% endfilter %}",
-    "logo": "{% filter absolute_url %}{{ static('protocol/img/logos/firefox/logo-lg-high-res.png') }}{% endfilter %}",
+    "logo": "{% filter absolute_url %}{{ static('img/structured-data/logo-firefox-brand.png') }}{% endfilter %}",
     "name": "Firefox",
     "sameAs": [
       "https://twitter.com/firefox",
@@ -48,7 +48,7 @@
     "@type": "Product",
     "@id": "{{ structured_data_id('firefoxandroid') }}",
     "url": "{% filter absolute_url %}{{ url('firefox.browsers.mobile.android') }}{% endfilter %}",
-    "logo": "{% filter absolute_url %}{{ static('protocol/img/logos/firefox/browser/logo-lg-high-res.png') }}{% endfilter %}",
+    "logo": "{% filter absolute_url %}{{ static('img/structured-data/logo-firefox-browser.png') }}{% endfilter %}",
     "image": [
       "{% filter absolute_url %}{{ static('img/structured-data/browser-android-1.jpg') }}{% endfilter %}",
       "{% filter absolute_url %}{{ static('img/structured-data/browser-android-2.jpg') }}{% endfilter %}",
@@ -82,7 +82,7 @@
     "@type": "Product",
     "@id": "{{ structured_data_id('firefoxbeta') }}",
     "url": "{% filter absolute_url %}{{ url('firefox.channel.desktop') }}{% endfilter %}",
-    "logo": "{% filter absolute_url %}{{ static('protocol/img/logos/firefox/browser/beta/logo-lg-high-res.png') }}{% endfilter %}",
+    "logo": "{% filter absolute_url %}{{ static('img/structured-data/logo-firefox-beta.png') }}{% endfilter %}",
     "image": [
       "{% filter absolute_url %}{{ static('img/structured-data/browser-beta-1.png') }}{% endfilter %}",
       "{% filter absolute_url %}{{ static('img/structured-data/browser-beta-2.png') }}{% endfilter %}",
@@ -113,7 +113,7 @@
     "@type": "Product",
     "@id": "{{ structured_data_id('firefoxbrowser') }}",
     "url": "{% filter absolute_url %}{{ url('firefox.new') }}{% endfilter %}",
-    "logo": "{% filter absolute_url %}{{ static('protocol/img/logos/firefox/browser/logo-lg-high-res.png') }}{% endfilter %}",
+    "logo": "{% filter absolute_url %}{{ static('img/structured-data/logo-firefox-browser.png') }}{% endfilter %}",
     "image": [
       "{% filter absolute_url %}{{ static('img/structured-data/browser-1.png') }}{% endfilter %}",
       "{% filter absolute_url %}{{ static('img/firefox/new/basic/browser-window.svg') }}{% endfilter %}",
@@ -146,7 +146,7 @@
     "@type": "Product",
     "@id": "{{ structured_data_id('firefoxdeveloper') }}",
     "url": "{% filter absolute_url %}{{ url('firefox.developer.index') }}{% endfilter %}",
-    "logo": "{% filter absolute_url %}{{ static('protocol/img/logos/firefox/browser/developer/logo-lg-high-res.png') }}{% endfilter %}",
+    "logo": "{% filter absolute_url %}{{ static('img/structured-data/logo-firefox-developer.png') }}{% endfilter %}",
     "image": [
       "{% filter absolute_url %}{{ static('img/firefox/developer/hero-screenshot-high-res.png') }}{% endfilter %}",
       "{% filter absolute_url %}{{ static('protocol/img/logos/firefox/browser/developer/og.png') }}{% endfilter %}",
@@ -177,7 +177,7 @@
     "@type": "Product",
     "@id": "{{ structured_data_id('firefoxenterprise') }}",
     "url": "{% filter absolute_url %}{{ url('firefox.enterprise.index') }}{% endfilter %}",
-    "logo": "{% filter absolute_url %}{{ static('protocol/img/logos/firefox/browser/logo-lg-high-res.png') }}{% endfilter %}",
+    "logo": "{% filter absolute_url %}{{ static('img/structured-data/logo-firefox-browser.png') }}{% endfilter %}",
     "image": [
       "{% filter absolute_url %}{{ static('img/firefox/enterprise/fx-browser-img.svg') }}{% endfilter %}",
       "{% filter absolute_url %}{{ static('img/structured-data/browser-enterprise-1.png') }}{% endfilter %}",
@@ -208,7 +208,7 @@
     "@type": "Product",
     "@id": "{{ structured_data_id('firefoxfiretv') }}",
     "url": "https://support.mozilla.org/{{ LANG }}/kb/firefox-fire-tv",
-    "logo": "{% filter absolute_url %}{{ static('protocol/img/logos/firefox/browser/logo-lg-high-res.png') }}{% endfilter %}",
+    "logo": "{% filter absolute_url %}{{ static('img/structured-data/logo-firefox-browser.png') }}{% endfilter %}",
     "image": [
       "{% filter absolute_url %}{{ static('img/structured-data/browser-tv-1.png') }}{% endfilter %}",
       "{% filter absolute_url %}{{ static('img/structured-data/browser-tv-2.png') }}{% endfilter %}",
@@ -239,7 +239,7 @@
     "@type": "Product",
     "@id": "{{ structured_data_id('firefoxios') }}",
     "url": "{% filter absolute_url %}{{ url('firefox.browsers.mobile.ios') }}{% endfilter %}",
-    "logo": "{% filter absolute_url %}{{ static('protocol/img/logos/firefox/browser/logo-lg-high-res.png') }}{% endfilter %}",
+    "logo": "{% filter absolute_url %}{{ static('img/structured-data/logo-firefox-browser.png') }}{% endfilter %}",
     "image": [
       "{% filter absolute_url %}{{ static('img/structured-data/browser-ios-1.png') }}{% endfilter %}",
       "{% filter absolute_url %}{{ static('img/structured-data/browser-ios-2.png') }}{% endfilter %}",
@@ -273,7 +273,7 @@
     "@type": "Product",
     "@id": "{{ structured_data_id('firefoxlinux') }}",
     "url": "{% filter absolute_url %}{{ url('firefox.linux') }}{% endfilter %}",
-    "logo": "{% filter absolute_url %}{{ static('protocol/img/logos/firefox/browser/logo-lg-high-res.png') }}{% endfilter %}",
+    "logo": "{% filter absolute_url %}{{ static('img/structured-data/logo-firefox-browser.png') }}{% endfilter %}",
     "image": [
       "{% filter absolute_url %}{{ static('img/structured-data/browser-2.png') }}{% endfilter %}",
       "{% filter absolute_url %}{{ static('img/structured-data/browser-linux-2.png') }}{% endfilter %}",
@@ -328,7 +328,7 @@
     "@type": "Product",
     "@id": "{{ structured_data_id('firefoxlockwise') }}",
     "url": "{% filter absolute_url %}{{ url('firefox.products.lockwise') }}{% endfilter %}",
-    "logo": "{% filter absolute_url %}{{ static('protocol/img/logos/firefox/lockwise/logo-lg-high-res.png') }}{% endfilter %}",
+    "logo": "{% filter absolute_url %}{{ static('img/structured-data/logo-firefox-lockwise.png') }}{% endfilter %}",
     "image": [
       "{% filter absolute_url %}{{ static('img/structured-data/lockwise.png') }}{% endfilter %}",
       "{% filter absolute_url %}{{ static('img/structured-data/lockwise-onboarding.png') }}{% endfilter %}",
@@ -358,7 +358,7 @@
     "@type": "Product",
     "@id": "{{ structured_data_id('firefoxmac') }}",
     "url": "{% filter absolute_url %}{{ url('firefox.mac') }}{% endfilter %}",
-    "logo": "{% filter absolute_url %}{{ static('protocol/img/logos/firefox/browser/logo-lg-high-res.png') }}{% endfilter %}",
+    "logo": "{% filter absolute_url %}{{ static('img/structured-data/logo-firefox-browser.png') }}{% endfilter %}",
     "image": [
       "{% filter absolute_url %}{{ static('img/structured-data/browser-2.png') }}{% endfilter %}",
       "{% filter absolute_url %}{{ static('img/structured-data/browser-mac-2.png') }}{% endfilter %}",
@@ -386,7 +386,7 @@
     "@type": "Product",
     "@id": "{{ structured_data_id('firefoxmonitor') }}",
     "url": "https://monitor.firefox.com",
-    "logo": "{% filter absolute_url %}{{ static('protocol/img/logos/firefox/monitor/logo-lg-high-res.png') }}{% endfilter %}",
+    "logo": "{% filter absolute_url %}{{ static('img/structured-data/logo-firefox-monitor.png') }}{% endfilter %}",
     "image": [
       "{% filter absolute_url %}{{ static('img/structured-data/monitor.png') }}{% endfilter %}",
       "{% filter absolute_url %}{{ static('img/firefox/accounts/trailhead/value-respect-high-res.jpg') }}{% endfilter %}",
@@ -415,7 +415,7 @@
     "@type": "Product",
     "@id": "{{ structured_data_id('firefoxnightly') }}",
     "url": "{% filter absolute_url %}{{ url('firefox.channel.desktop') }}{% endfilter %}",
-    "logo": "{% filter trim|absolute_url %}{{ static('protocol/img/logos/firefox/browser/nightly/logo-lg-high-res.png') }}{% endfilter %}",
+    "logo": "{% filter trim|absolute_url %}{{ static('img/structured-data/logo-firefox-nightly.png') }}{% endfilter %}",
     "image": [
       "{% filter absolute_url %}{{ static('img/structured-data/browser-nightly-1.png') }}{% endfilter %}",
       "{% filter absolute_url %}{{ static('img/structured-data/browser-nightly-2.png') }}{% endfilter %}",
@@ -450,7 +450,7 @@
     "@type": "Product",
     "@id": "{{ structured_data_id('firefoxwindows') }}",
     "url": "{% filter absolute_url %}{{ url('firefox.windows') }}{% endfilter %}",
-    "logo": "{% filter absolute_url %}{{ static('protocol/img/logos/firefox/browser/logo-lg-high-res.png') }}{% endfilter %}",
+    "logo": "{% filter absolute_url %}{{ static('img/structured-data/logo-firefox-browser.png') }}{% endfilter %}",
     "image": [
       "{% filter absolute_url %}{{ static('img/structured-data/browser-2.png') }}{% endfilter %}",
       "{% filter absolute_url %}{{ static('img/firefox/new/basic/browser-window.svg') }}{% endfilter %}",

bedrock/base/templates/includes/structured-data/software/firefox-android-software.json

@@ -4,7 +4,7 @@
   "@id": "{{ structured_data_id('firefoxandroid') }}",
   "url": "{% filter absolute_url %}{{ url('firefox.browsers.mobile.android') }}{% endfilter %}",
   "name": "Firefox Browser Android",
-  "image": "{% filter absolute_url %}{{ static('protocol/img/logos/firefox/browser/logo-lg-high-res.png') }}{% endfilter %}",
+  "image": "{% filter absolute_url %}{{ static('img/structured-data/logo-firefox-browser.png') }}{% endfilter %}",
   "alternateName": [
     "Firefox Android",
     "Firefox Browser for Android",

bedrock/base/templates/includes/structured-data/software/firefox-beta-software.json

@@ -4,7 +4,7 @@
   "@id": "{{ structured_data_id('firefoxbeta') }}",
   "url": "{% filter absolute_url %}{{ url('firefox.channel.desktop') }}{% endfilter %}",
   "name": "Firefox Browser Beta",
-  "image": "{% filter absolute_url %}{{ static('protocol/img/logos/firefox/browser/beta/logo-lg-high-res.png') }}{% endfilter %}",
+  "image": "{% filter absolute_url %}{{ static('img/structured-data/logo-firefox-beta.png') }}{% endfilter %}",
   "alternateName": [
     "Firefox Beta",
     "Firefox Beta Browser"

bedrock/base/templates/includes/structured-data/software/firefox-browser-software.json

@@ -4,7 +4,7 @@
   "@id": "{{ structured_data_id('firefoxbrowser') }}",
   "url": "{% filter absolute_url %}{{ url('firefox.new') }}{% endfilter %}",
   "name": "Firefox Browser",
-  "image": "{% filter absolute_url %}{{ static('protocol/img/logos/firefox/browser/logo-lg-high-res.png') }}{% endfilter %}",
+  "image": "{% filter absolute_url %}{{ static('img/structured-data/logo-firefox-browser.png') }}{% endfilter %}",
   "alternateName": [
     "Firefox Desktop",
     "Firefox Browser for Desktop",

bedrock/base/templates/includes/structured-data/software/firefox-developer-software.json

@@ -4,7 +4,7 @@
   "@id": "{{ structured_data_id('firefoxdeveloper') }}",
   "url": "{% filter absolute_url %}{{ url('firefox.developer.index') }}{% endfilter %}",
   "name": "Firefox Browser Developer Edition ",
-  "image": "{% filter absolute_url %}{{ static('protocol/img/logos/firefox/browser/developer/logo-lg-high-res.png') }}{% endfilter %}",
+  "image": "{% filter absolute_url %}{{ static('img/structured-data/logo-firefox-developer.png') }}{% endfilter %}",
   "alternateName": [
     "Firefox Developer Edition",
     "Firefox Developer Edition Browser"

bedrock/base/templates/includes/structured-data/software/firefox-enterprise-software.json

@@ -4,7 +4,7 @@
   "@id": "{{ structured_data_id('firefoxenterprise') }}",
   "url": "{% filter absolute_url %}{{ url('firefox.enterprise.index') }}{% endfilter %}",
   "name": "Firefox Browser Enterprise",
-  "image": "{% filter absolute_url %}{{ static('protocol/img/logos/firefox/browser/logo-lg-high-res.png') }}{% endfilter %}",
+  "image": "{% filter absolute_url %}{{ static('img/structured-data/logo-firefox-browser.png') }}{% endfilter %}",
   "alternateName": [
     "Firefox for Enterprise",
     "Firefox Browser for Enterprise"

bedrock/base/templates/includes/structured-data/software/firefox-fire-tv-software.json

@@ -4,7 +4,7 @@
   "@id": "{{ structured_data_id('firefoxfiretv') }}",
   "url": "https://support.mozilla.org/{{ LANG }}/kb/firefox-fire-tv",
   "name": "Firefox Browser Fire TV",
-  "image": "{% filter absolute_url %}{{ static('protocol/img/logos/firefox/browser/logo-lg-high-res.png') }}{% endfilter %}",
+  "image": "{% filter absolute_url %}{{ static('img/structured-data/logo-firefox-browser.png') }}{% endfilter %}",
   "alternateName": [
     "Firefox for Fire TV",
     "Firefox Browser for Fire TV"

bedrock/base/templates/includes/structured-data/software/firefox-focus-software.json

@@ -4,7 +4,7 @@
   "@id": "https://www.mozilla.org/#firefoxfocus",
   "url": "https://www.mozilla.org/{{ LANG }}/firefox/browsers/mobile/focus/",
   "name": "Firefox Focus",
-  "image": "{% filter absolute_url %}{{ static('protocol/img/logos/firefox/browser/focus/logo-lg-high-res.png') }}{% endfilter %}",
+  "image": "{% filter absolute_url %}{{ static('img/structured-data/logo-firefox-focus.png') }}{% endfilter %}",
   "sameAs": [
     "https://www.wikidata.org/wiki/Q31020870",
     "https://{{ lang_short() }}.wikipedia.org/wiki/Firefox_Focus",