diff --git a/bedrock/firefox/templates/firefox/whatsnew/includes/fx86/hero-devices.svg b/bedrock/firefox/templates/firefox/whatsnew/includes/fx86/hero-devices.svg deleted file mode 100644 index bc720daf69..0000000000 --- a/bedrock/firefox/templates/firefox/whatsnew/includes/fx86/hero-devices.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/bedrock/firefox/templates/firefox/whatsnew/includes/fx88/illo-vpn-lock.svg b/bedrock/firefox/templates/firefox/whatsnew/includes/fx88/illo-vpn-lock.svg deleted file mode 100644 index 7a3cad27a8..0000000000 --- a/bedrock/firefox/templates/firefox/whatsnew/includes/fx88/illo-vpn-lock.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/bedrock/firefox/templates/firefox/whatsnew/includes/fx88/illo-vpn-speed.svg b/bedrock/firefox/templates/firefox/whatsnew/includes/fx88/illo-vpn-speed.svg deleted file mode 100644 index 0f5dad75ad..0000000000 --- a/bedrock/firefox/templates/firefox/whatsnew/includes/fx88/illo-vpn-speed.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/bedrock/firefox/templates/firefox/whatsnew/includes/fx88/logo-android.svg b/bedrock/firefox/templates/firefox/whatsnew/includes/fx88/logo-android.svg deleted file mode 100644 index 25de3f6d80..0000000000 --- a/bedrock/firefox/templates/firefox/whatsnew/includes/fx88/logo-android.svg +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/bedrock/firefox/templates/firefox/whatsnew/includes/fx88/logo-apple.svg b/bedrock/firefox/templates/firefox/whatsnew/includes/fx88/logo-apple.svg deleted file mode 100644 index 51ab0ff344..0000000000 --- a/bedrock/firefox/templates/firefox/whatsnew/includes/fx88/logo-apple.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/bedrock/firefox/templates/firefox/whatsnew/includes/fx88/logo-linux.svg b/bedrock/firefox/templates/firefox/whatsnew/includes/fx88/logo-linux.svg deleted file mode 100644 index a8c8acc16c..0000000000 --- a/bedrock/firefox/templates/firefox/whatsnew/includes/fx88/logo-linux.svg +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - - - - - - - - - - diff --git a/bedrock/firefox/templates/firefox/whatsnew/includes/fx88/logo-windows.svg b/bedrock/firefox/templates/firefox/whatsnew/includes/fx88/logo-windows.svg deleted file mode 100644 index 375fedd9e4..0000000000 --- a/bedrock/firefox/templates/firefox/whatsnew/includes/fx88/logo-windows.svg +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/bedrock/firefox/templates/firefox/whatsnew/includes/fx90/globe.svg b/bedrock/firefox/templates/firefox/whatsnew/includes/fx90/globe.svg deleted file mode 100644 index 999ffc3ed1..0000000000 --- a/bedrock/firefox/templates/firefox/whatsnew/includes/fx90/globe.svg +++ /dev/null @@ -1,52 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/bedrock/firefox/templates/firefox/whatsnew/includes/fx90/home.svg b/bedrock/firefox/templates/firefox/whatsnew/includes/fx90/home.svg deleted file mode 100644 index 16dc7b4036..0000000000 --- a/bedrock/firefox/templates/firefox/whatsnew/includes/fx90/home.svg +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/bedrock/firefox/templates/firefox/whatsnew/includes/fx90/mozilla-vpn-logo.svg b/bedrock/firefox/templates/firefox/whatsnew/includes/fx90/mozilla-vpn-logo.svg deleted file mode 100644 index af6cc25cab..0000000000 --- a/bedrock/firefox/templates/firefox/whatsnew/includes/fx90/mozilla-vpn-logo.svg +++ /dev/null @@ -1,4 +0,0 @@ - diff --git a/bedrock/firefox/templates/firefox/whatsnew/includes/fx90/person1.svg b/bedrock/firefox/templates/firefox/whatsnew/includes/fx90/person1.svg deleted file mode 100644 index a2b2a637ec..0000000000 --- a/bedrock/firefox/templates/firefox/whatsnew/includes/fx90/person1.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/bedrock/firefox/templates/firefox/whatsnew/includes/fx90/person2.svg b/bedrock/firefox/templates/firefox/whatsnew/includes/fx90/person2.svg deleted file mode 100644 index 849a6a18ad..0000000000 --- a/bedrock/firefox/templates/firefox/whatsnew/includes/fx90/person2.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/bedrock/firefox/templates/firefox/whatsnew/includes/fx90/person3.svg b/bedrock/firefox/templates/firefox/whatsnew/includes/fx90/person3.svg deleted file mode 100644 index bcc988b5a2..0000000000 --- a/bedrock/firefox/templates/firefox/whatsnew/includes/fx90/person3.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/bedrock/firefox/templates/firefox/whatsnew/includes/fx90/person4.svg b/bedrock/firefox/templates/firefox/whatsnew/includes/fx90/person4.svg deleted file mode 100644 index ee75998da6..0000000000 --- a/bedrock/firefox/templates/firefox/whatsnew/includes/fx90/person4.svg +++ /dev/null @@ -1,97 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/bedrock/firefox/templates/firefox/whatsnew/includes/fx90/stay-safe.svg b/bedrock/firefox/templates/firefox/whatsnew/includes/fx90/stay-safe.svg deleted file mode 100644 index 082d25dc59..0000000000 --- a/bedrock/firefox/templates/firefox/whatsnew/includes/fx90/stay-safe.svg +++ /dev/null @@ -1,39 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/bedrock/firefox/templates/firefox/whatsnew/whatsnew-fx86-en.html b/bedrock/firefox/templates/firefox/whatsnew/whatsnew-fx86-en.html deleted file mode 100644 index a74adb3c16..0000000000 --- a/bedrock/firefox/templates/firefox/whatsnew/whatsnew-fx86-en.html +++ /dev/null @@ -1,84 +0,0 @@ -{# This Source Code Form is subject to the terms of the Mozilla Public - # License, v. 2.0. If a copy of the MPL was not distributed with this - # file, You can obtain one at http://mozilla.org/MPL/2.0/. -#} - -{% from "macros.html" import google_play_button, send_to_device with context %} - -{% extends "firefox/whatsnew/base.html" %} - -{% block page_title %}What’s new with Firefox{% endblock %} - -{#- This will appear as which can be used for social share -#} -{% block page_og_desc %}What’s new with Firefox{% endblock %} - -{% block body_id %}firefox-whatsnew{% endblock %} -{% block body_class %}{% endblock %} - -{% block page_css %} - {{ css_bundle('firefox_whatsnew_86') }} -{% endblock %} - -{% set android_url = firefox_adjust_url('android', campaign) %} -{% set ios_url = firefox_adjust_url('ios', campaign) %} - -{% block site_header %}{% endblock %} - -{% block content %} -
- {% include 'firefox/whatsnew/includes/header.html' %} - -
-
-
- {% include 'firefox/whatsnew/includes/fx86/hero-devices.svg' %} -
-

Get more Firefox in your life

-

Go from laptop to phone and back without skipping a beat.
Get Firefox for mobile.

- -
-
- {{ send_to_device(include_title=False, message_set='fx-whatsnew', input_label='Enter your email for a download link', class='vertical') }} -
-
-
-
- -
-
-
- -
- -

Our secret sauce for Android

-
-

They’re called Firefox Add-ons and they’re like these magical power-ups you can add to the Android version of Firefox to make it even better. You should try them.

- {{ google_play_button(href=android_url, id='playStoreLink') }} -
-
- -
- -

Psst. You don’t have to use Safari anymore

-
-

Hey iPhone users, now you can choose whatever default browser you want. Maybe think about using the only super-fast, ultra-private browser that’s backed by a non-profit?

-

No pressure though.

- - {{ ftl('download-button-download-app-store') }} - -
-
-
-
-
- - - -
-{% endblock %} - -{% block js %} - {{ js_bundle('firefox_whatsnew_86') }} -{% endblock %} diff --git a/bedrock/firefox/templates/firefox/whatsnew/whatsnew-fx87-en.html b/bedrock/firefox/templates/firefox/whatsnew/whatsnew-fx87-en.html deleted file mode 100644 index 0a366a1b98..0000000000 --- a/bedrock/firefox/templates/firefox/whatsnew/whatsnew-fx87-en.html +++ /dev/null @@ -1,103 +0,0 @@ -{# This Source Code Form is subject to the terms of the Mozilla Public - # License, v. 2.0. If a copy of the MPL was not distributed with this - # file, You can obtain one at http://mozilla.org/MPL/2.0/. -#} - - -{% extends "firefox/whatsnew/base.html" %} - -{% block page_title %}What’s new with Firefox{% endblock %} - -{#- This will appear as which can be used for social share -#} -{% block page_og_desc %}What’s new with Firefox{% endblock %} - -{% block body_id %}firefox-whatsnew{% endblock %} -{% block body_class %}{% endblock %} - -{% block page_css %} - {{ css_bundle('firefox_whatsnew_87') }} -{% endblock %} - -{% block site_header %}{% endblock %} - -{% block content %} -
- {% include 'firefox/whatsnew/includes/header.html' %} - -
-
-
-
-
- - - -
-
-
-

Watch more games at once with Multi Picture-in-Picture

-

Pop out one or more games from their webpages or players to pin them to your screen.

- -
- -
- -
-
- -
-
-

Useful ways to use Picture-in-Picture

- -
-
-
-
-
- - - -
-
-
-

Tutorials

-
-

Keep the how-to videos front and center while digging into your settings.

-
-
- -
-
-
-
- - - -
-
-
-

Serenity now

-
-

Pop out videos of some cuddly animals to bring some peace to your day. No one needs to know.

-
-
-
-
-
- - - -
-{% endblock %} - -{% block site_footer %} - {% with theme_class='mzp-t-ink' %} - {% include 'includes/protocol/footer/footer.html' %} - {% endwith %} -{% endblock %} - -{% block js %} - {{ js_bundle('firefox_whatsnew_87') }} -{% endblock %} diff --git a/bedrock/firefox/templates/firefox/whatsnew/whatsnew-fx88-en.html b/bedrock/firefox/templates/firefox/whatsnew/whatsnew-fx88-en.html deleted file mode 100644 index 46679d664c..0000000000 --- a/bedrock/firefox/templates/firefox/whatsnew/whatsnew-fx88-en.html +++ /dev/null @@ -1,95 +0,0 @@ -{# This Source Code Form is subject to the terms of the Mozilla Public - # License, v. 2.0. If a copy of the MPL was not distributed with this - # file, You can obtain one at http://mozilla.org/MPL/2.0/. -#} - -{% extends "firefox/whatsnew/base.html" %} - -{% block page_title %}What’s new with Firefox{% endblock %} - -{#- This will appear as which can be used for social share -#} -{% block page_og_desc %}What’s new with Firefox{% endblock %} - -{% block body_id %}firefox-whatsnew{% endblock %} -{% block body_class %}{% endblock %} - -{% block page_css %} - {{ css_bundle('firefox_whatsnew_88_en') }} -{% endblock %} - -{% block site_header %}{% endblock %} - -{% block content %} -
-
-
-

{{ ftl('whatsnew-firefox-browser') }}

-
-

Congrats! You’re now using version 88 of Firefox.

-
-
-

{{ ftl('whatsnew-out-of-date-notification') }}

-
-
-
- - {% set landing_source = '?source=' + campaign if campaign else '' %} - {% set landing_variant = '-v' + variant if variant else '' %} - -
-
- -

Change your device’s location for next-level privacy

-

Mozilla VPN (Virtual Private Network) protects your entire internet connection on your computer, your tablet, and even your phone. For even more security, it comes with a 30-day money back guarantee.

- - -
-
- -
-
-
-

Available now for Windows, Mac, Android, iOS and Linux.

- {% include 'firefox/whatsnew/includes/fx88/logo-windows.svg' %} - {% include 'firefox/whatsnew/includes/fx88/logo-linux.svg' %} - {% include 'firefox/whatsnew/includes/fx88/logo-apple.svg' %} - {% include 'firefox/whatsnew/includes/fx88/logo-android.svg' %} -
- -
- -
-
- {% include 'firefox/whatsnew/includes/fx88/illo-vpn-speed.svg' %} -
-

It’s fast, very fast

-
-

Our WireGuard® powered servers are built for speed so you can stream, download, and game as usual.

-
-
- -
-
- {% include 'firefox/whatsnew/includes/fx88/illo-vpn-lock.svg' %} -
-

Internet without a trace

-
-

We never log, track, or share your network data — your online activity won’t leave a footprint on our VPN servers.

-
-
-
-
-
- - - -
-{% endblock %} - -{% block js %} - {{ js_bundle('firefox_whatsnew_88_en') }} -{% endblock %} diff --git a/bedrock/firefox/templates/firefox/whatsnew/whatsnew-fx90-en.html b/bedrock/firefox/templates/firefox/whatsnew/whatsnew-fx90-en.html deleted file mode 100644 index d555557cd9..0000000000 --- a/bedrock/firefox/templates/firefox/whatsnew/whatsnew-fx90-en.html +++ /dev/null @@ -1,129 +0,0 @@ -{# This Source Code Form is subject to the terms of the Mozilla Public - # License, v. 2.0. If a copy of the MPL was not distributed with this - # file, You can obtain one at http://mozilla.org/MPL/2.0/. -#} - -{% extends "firefox/whatsnew/base.html" %} - -{% block page_title %}What’s new with Firefox{% endblock %} - -{#- This will appear as which can be used for social share -#} -{% block page_og_desc %}What’s new with Firefox{% endblock %} - -{% block body_id %}firefox-whatsnew{% endblock %} -{% block body_class %}{% endblock %} - -{% block page_css %} - {{ css_bundle('firefox_whatsnew_90') }} -{% endblock %} - -{% block experiments %} - {% if switch('firefox-whatsnew90-experiment', ['en-US', 'en-CA']) %} - {{ js_bundle('firefox_whatsnew90_experiment') }} - {% endif %} -{% endblock %} - -{% set _entrypoint = 'mozilla.org-whatsnew90' %} - -{% set utm_campaign = 'wnp90' %} - -{% if variant == '1' %} - {% set utm_content= 'v1' %} -{% elif variant == '2' %} - {% set utm_content = 'v2' %} -{% else %} - {% set utm_content = 'all' %} -{% endif %} - -{% block site_header %}{% endblock %} - -{% block content %} -
- {% include 'firefox/whatsnew/includes/header.html' %} - -
-
- Pocket -

Your save button for the internet

-

Click the Save to Pocket button in your Firefox toolbar anytime you see something you want to save for later, like an article, video — even a tweet. It’ll go straight to your library in Pocket.

- -
- {% if variant == '2' %} - Sign up for Pocket - {% else %} - {{ pocket_fxa_button(entrypoint=_entrypoint, button_text='Activate Pocket in Firefox', optional_parameters={'s': _entrypoint, 'utm_campaign': utm_campaign, 'utm_content': utm_content + 'fxa'}, optional_attributes={'data-cta-text': 'Activate Pocket in Firefox', 'data-cta-type': 'button', 'data-cta-position': 'primary'}) }} -

More ways to sign up

- {% endif %} -
-
-
- -
-
-
- -
-
- {% include 'firefox/whatsnew/includes/fx90/person1.svg' %} -
-

Collect articles, videos, recipes — anything

-
-

You’ll never lose track of content again.

-
-
- -
-
- {% include 'firefox/whatsnew/includes/fx90/person2.svg' %} -
-

Discover fascinating stories from all over

-

See popular articles and our editors’ top picks.

-
-
- -
-
- {% include 'firefox/whatsnew/includes/fx90/person3.svg' %} -
-

Ditch the ads & internet noise

-

Dig into your saves in Pocket’s calm reading zone.

-
-
- -
-
- {% include 'firefox/whatsnew/includes/fx90/person4.svg' %} -
-

Find that one article from months ago

-

Search your Pocket and bam! There it is.

-
-
- -
-
-
- - - - - -
-{% endblock %} - -{% block js %} - {{ js_bundle('firefox_whatsnew_90') }} -{% endblock %} diff --git a/bedrock/firefox/templates/firefox/whatsnew/whatsnew-fx90-eu.html b/bedrock/firefox/templates/firefox/whatsnew/whatsnew-fx90-eu.html deleted file mode 100644 index 9fcccb5ab4..0000000000 --- a/bedrock/firefox/templates/firefox/whatsnew/whatsnew-fx90-eu.html +++ /dev/null @@ -1,126 +0,0 @@ -{# This Source Code Form is subject to the terms of the Mozilla Public - # License, v. 2.0. If a copy of the MPL was not distributed with this - # file, You can obtain one at http://mozilla.org/MPL/2.0/. -#} - -{% from "macros-protocol.html" import split with context %} - -{% extends "firefox/whatsnew/base.html" %} - -{% block page_title %}{{ ftl('whatsnew-page-title') }}{% endblock %} - -{#- This will appear as which can be used for social share -#} -{% block page_og_desc %}{{ ftl('whatsnew-page-description') }}{% endblock %} - -{% block body_id %}firefox-whatsnew{% endblock %} -{% block body_class %}{% endblock %} - -{% block page_css %} - {{ css_bundle('firefox_whatsnew_90_eu') }} -{% endblock %} - -{% block site_header %}{% endblock %} - -{% set landing_source = '?source=' + campaign if campaign else '' %} - -{% block content %} -
- {% include 'firefox/whatsnew/includes/header.html' %} - -
-
- {% include 'firefox/whatsnew/includes/fx90/mozilla-vpn-logo.svg' %} -

{{ ftl('whatsnew90-main-heading') }}

-

{{ ftl('whatsnew90-main-body') }}

- - -
- -
-
-
-
- {% include 'firefox/whatsnew/includes/fx90/stay-safe.svg' %} -
-

{{ ftl('whatsnew90-block-1-heading') }}

-
-

{{ ftl('whatsnew90-block-1-body') }}

-
-
- -
-
- {% include 'firefox/whatsnew/includes/fx90/home.svg' %} -
-

{{ ftl('whatsnew90-block-2-heading') }}

-
- {% if ftl_has_messages('whatsnew90-block-2-body-v2') %} -

{{ ftl('whatsnew90-block-2-body-v2', servers=settings.VPN_CONNECT_SERVERS, countries=settings.VPN_CONNECT_COUNTRIES) }}

- {% else %} -

{{ ftl('whatsnew90-block-2-body') }}

- {% endif %} -

-
-
-
- -
-

{{ ftl('whatsnew90-availability-heading') }}

- - {% call split( - block_class='mzp-l-split-center-on-sm-md mzp-t-split-nospace mzp-t-content-sm', - media_class='mzp-l-split-h-center', - media_include='firefox/whatsnew/includes/fx90/globe.svg', - media_after=True - ) %} -

{{ ftl('whatsnew90-availability-body') }}

-

- {{ ftl('whatsnew90-main-cta') }} -

- {% endcall %} -
- -
-

{{ ftl('whatsnew90-press-logos-heading') }}

-
    -
  • - - - PC Gamer - -
  • -
  • - - - CNet - -
  • -
  • - - - Gizmodo - -
  • -
  • - - - Wired - -
  • -
-
-
- - -
- -
-{% endblock %} - -{% block js %} - {{ js_bundle('firefox_whatsnew') }} -{% endblock %} diff --git a/bedrock/firefox/templates/firefox/whatsnew/whatsnew-mobile-de.html b/bedrock/firefox/templates/firefox/whatsnew/whatsnew-mobile-de.html deleted file mode 100644 index 93571c53e6..0000000000 --- a/bedrock/firefox/templates/firefox/whatsnew/whatsnew-mobile-de.html +++ /dev/null @@ -1,73 +0,0 @@ -{# This Source Code Form is subject to the terms of the Mozilla Public - # License, v. 2.0. If a copy of the MPL was not distributed with this - # file, You can obtain one at http://mozilla.org/MPL/2.0/. -#} - -{% from "macros.html" import send_to_device with context %} - -{% extends "firefox/whatsnew/base.html" %} - -{% block page_title %}{{ ftl('whatsnew-page-title') }}{% endblock %} -{% block page_desc %}{{ ftl('whatsnew-page-description') }}{% endblock %} - -{#- This will appear as which can be used for social share -#} -{% block page_og_desc %}{{ ftl('whatsnew-page-description') }}{% endblock %} - -{#- Override for social share -#} -{% block page_og_url %}{{ url('firefox.browsers.mobile.index') }}{% endblock %} - -{% block body_id %}firefox-whatsnew-mobile-de{% endblock %} -{% block body_class %}{{ super() }}{% endblock %} - -{% block site_header %}{% endblock %} - -{% block page_css %} - {{ css_bundle('firefox_whatsnew_mobile_de') }} -{% endblock %} - -{% block content %} -
- {% include 'firefox/whatsnew/includes/header.html' %} - -
-
- {{ high_res_img('protocol/img/logos/firefox/browser/logo-md.png', {'alt': '', 'width': '96', 'height': '96', 'class': 'wnp-main-image'}) }} -

Hol dir den neuen Firefox auch auf dein Smartphone

- -
- {{ send_to_device(title_text='Sende einen Download-Link an dein Handy.', message_set='fx-whatsnew', spinner_color='#fff;', class='vertical') }} -
- -
-
-
- -
-

Firefox für Android

-
-

Chip.de sagt: Eine der wichtigsten Android-Anwendungen für 2021. Firefox ist ein “klasse Browser im minimalistischen Design.”

-
-
- -
-
- -
-

Firefox für iOS

-
-

Wir sagen: Darf auch auf iOS nicht fehlen. Mach Firefox auch auf dem iPhone zu deinem Standardbrowser.

-
-
-
-
-
- - -
-{% endblock %} - -{% block js %} - {{ js_bundle('firefox_whatsnew') }} -{% endblock %} diff --git a/bedrock/firefox/templates/firefox/whatsnew/whatsnew-mobile-qrcode-de.html b/bedrock/firefox/templates/firefox/whatsnew/whatsnew-mobile-qrcode-de.html deleted file mode 100644 index 8a1258b6bd..0000000000 --- a/bedrock/firefox/templates/firefox/whatsnew/whatsnew-mobile-qrcode-de.html +++ /dev/null @@ -1,75 +0,0 @@ -{# This Source Code Form is subject to the terms of the Mozilla Public - # License, v. 2.0. If a copy of the MPL was not distributed with this - # file, You can obtain one at http://mozilla.org/MPL/2.0/. -#} - -{% extends "firefox/whatsnew/base.html" %} - -{% block page_title %}{{ ftl('whatsnew-page-title') }}{% endblock %} -{% block page_desc %}{{ ftl('whatsnew-page-description') }}{% endblock %} - -{#- This will appear as which can be used for social share -#} -{% block page_og_desc %}{{ ftl('whatsnew-page-description') }}{% endblock %} - -{#- Override for social share -#} -{% block page_og_url %}{{ url('firefox.browsers.mobile.index') }}{% endblock %} - -{% block body_id %}firefox-whatsnew-mobile-qr-code-de{% endblock %} -{% block body_class %}{{ super() }}{% endblock %} - -{% block site_header %}{% endblock %} - -{% block page_css %} - {{ css_bundle('firefox_whatsnew_mobile_qrcode_de') }} -{% endblock %} - -{% block content %} -
- {% include 'firefox/whatsnew/includes/header.html' %} - -
-
- {{ high_res_img('protocol/img/logos/firefox/browser/logo-md.png', {'alt': '', 'width': '96', 'height': '96', 'class': 'wnp-main-image'}) }} -

Der neue Firefox jetzt auch für dein Smartphone

-

Superschnell. Standardmäßig privat. Individuell anpassbar.

- -

Hol dir Firefox Mobile

-

Scanne den QR Code, um loszulegen.

- -
- {{ qrcode('https://app.adjust.com/vhrf030') }} -
- -
-
-
- -
-

Firefox für Android

-
-

Chip.de sagt: Eine der wichtigsten Android-Anwendungen für 2021. Firefox ist ein “klasse Browser im minimalistischen Design.”

-
-
- -
-
- -
-

Firefox für iOS

-
-

Wir sagen: Darf auch auf iOS nicht fehlen. Mach Firefox auch auf dem iPhone zu deinem Standardbrowser.

-
-
-
-
-
- - -
-{% endblock %} - -{% block js %} - {{ js_bundle('firefox_whatsnew_update') }} -{% endblock %} diff --git a/bedrock/firefox/tests/test_base.py b/bedrock/firefox/tests/test_base.py index b2df00b537..f5a1b46788 100644 --- a/bedrock/firefox/tests/test_base.py +++ b/bedrock/firefox/tests/test_base.py @@ -390,126 +390,6 @@ class TestWhatsNew(TestCase): template = render_mock.call_args[0][1] assert template == ["firefox/whatsnew/index.html"] - # begin 86.0 whatsnew tests - - def test_fx_86_0_0_en(self, render_mock): - """Should use whatsnew-fx86 template for 86.0 in English""" - req = self.rf.get("/firefox/whatsnew/") - req.locale = "en-US" - self.view(req, version="86.0") - template = render_mock.call_args[0][1] - assert template == ["firefox/whatsnew/whatsnew-fx86-en.html"] - - def test_fx_86_0_0_de(self, render_mock): - """Should use whatsnew-mobile-qrcode-de template for 86.0 in German""" - req = self.rf.get("/firefox/whatsnew/") - req.locale = "de" - self.view(req, version="86.0") - template = render_mock.call_args[0][1] - assert template == ["firefox/whatsnew/whatsnew-mobile-qrcode-de.html"] - - def test_fx_86_0_0_locale(self, render_mock): - """Should use standard whatsnew template for 86.0 in other locales""" - req = self.rf.get("/firefox/whatsnew/") - req.locale = "es-ES" - self.view(req, version="86.0") - template = render_mock.call_args[0][1] - assert template == ["firefox/whatsnew/index-account.html"] - - # end 86.0 whatsnew tests - - # begin 87.0 whatsnew tests - - def test_fx_87_0_0_en(self, render_mock): - """Should use PiP template for 87.0 in US English""" - req = self.rf.get("/firefox/whatsnew/") - req.locale = "en-US" - self.view(req, version="87.0") - template = render_mock.call_args[0][1] - assert template == ["firefox/whatsnew/whatsnew-fx87-en.html"] - - def test_fx_87_0_0_locale(self, render_mock): - """Should use standard whatsnew template for 87.0 in other locales""" - req = self.rf.get("/firefox/whatsnew/") - req.locale = "es-ES" - self.view(req, version="87.0") - template = render_mock.call_args[0][1] - assert template == ["firefox/whatsnew/index-account.html"] - - # end 87.0 whatsnew tests - - # begin 88.0 whatsnew tests - - def test_fx_88_0_0_en(self, render_mock): - """Should use whatsnew-fx88-en template for 88.0 in English""" - req = self.rf.get("/firefox/whatsnew/") - req.locale = "en-US" - self.view(req, version="88.0") - template = render_mock.call_args[0][1] - assert template == ["firefox/whatsnew/whatsnew-fx88-en.html"] - - def test_fx_88_0_0_locale(self, render_mock): - """Should use standard whatsnew template for 88.0 in other locales""" - req = self.rf.get("/firefox/whatsnew/") - req.locale = "es-ES" - self.view(req, version="88.0") - template = render_mock.call_args[0][1] - assert template == ["firefox/whatsnew/index-account.html"] - - # end 88.0 whatsnew tests - - # begin 90.0 whatsnew tests - - def test_fx_90_0_0_en(self, render_mock): - """Should use whatsnew-fx90-en template for 90.0 in English""" - req = self.rf.get("/firefox/whatsnew/") - req.locale = "en-US" - self.view(req, version="90.0") - template = render_mock.call_args[0][1] - assert template == ["firefox/whatsnew/whatsnew-fx90-en.html"] - - def test_fx_90_0_0_de(self, render_mock): - """Should use VPN template for 90.0 in German""" - req = self.rf.get("/firefox/whatsnew/") - req.locale = "de" - self.view(req, version="90.0") - template = render_mock.call_args[0][1] - assert template == ["firefox/whatsnew/whatsnew-fx90-eu.html"] - - def test_fx_90_0_0_fr(self, render_mock): - """Should use VPN template for 90.0 in French""" - req = self.rf.get("/firefox/whatsnew/") - req.locale = "fr" - self.view(req, version="90.0") - template = render_mock.call_args[0][1] - assert template == ["firefox/whatsnew/whatsnew-fx90-eu.html"] - - def test_fx_90_0_0_it(self, render_mock): - """Should use VPN template for 90.0 in Italian""" - req = self.rf.get("/firefox/whatsnew/") - req.locale = "it" - self.view(req, version="90.0") - template = render_mock.call_args[0][1] - assert template == ["firefox/whatsnew/whatsnew-fx90-eu.html"] - - def test_fx_90_0_0_nl(self, render_mock): - """Should use VPN template for 90.0 in Dutch""" - req = self.rf.get("/firefox/whatsnew/") - req.locale = "nl" - self.view(req, version="90.0") - template = render_mock.call_args[0][1] - assert template == ["firefox/whatsnew/whatsnew-fx90-eu.html"] - - def test_fx_90_0_0_es(self, render_mock): - """Should use VPN template for 90.0 in Spanish""" - req = self.rf.get("/firefox/whatsnew/") - req.locale = "es-ES" - self.view(req, version="90.0") - template = render_mock.call_args[0][1] - assert template == ["firefox/whatsnew/whatsnew-fx90-eu.html"] - - # end 90.0 whatsnew tests - # begin 91.0 whatsnew tests def test_fx_91_0_0_en(self, render_mock): diff --git a/bedrock/firefox/views.py b/bedrock/firefox/views.py index 1ffacb09f3..cc6bcdd9e1 100644 --- a/bedrock/firefox/views.py +++ b/bedrock/firefox/views.py @@ -503,13 +503,6 @@ class WhatsnewView(L10nTemplateView): "firefox/nightly/whatsnew.html": ["firefox/nightly/whatsnew", "firefox/whatsnew/whatsnew"], "firefox/whatsnew/index-account.html": ["firefox/whatsnew/whatsnew-account", "firefox/whatsnew/whatsnew"], "firefox/whatsnew/index.html": ["firefox/whatsnew/whatsnew-s2d", "firefox/whatsnew/whatsnew"], - "firefox/whatsnew/whatsnew-fx86-en.html": ["firefox/whatsnew/whatsnew-s2d", "firefox/whatsnew/whatsnew"], - "firefox/whatsnew/whatsnew-fx87-en.html": ["firefox/whatsnew/whatsnew"], - "firefox/whatsnew/whatsnew-fx88-en.html": ["firefox/whatsnew/whatsnew"], - "firefox/whatsnew/whatsnew-mobile-de.html": ["firefox/whatsnew/whatsnew"], - "firefox/whatsnew/whatsnew-mobile-qrcode-de.html": ["firefox/whatsnew/whatsnew"], - "firefox/whatsnew/whatsnew-fx90-en.html": ["firefox/whatsnew/whatsnew"], - "firefox/whatsnew/whatsnew-fx90-eu.html": ["firefox/whatsnew/whatsnew-fx90.ftl", "firefox/whatsnew/whatsnew"], "firefox/whatsnew/whatsnew-fx91-en.html": ["firefox/whatsnew/whatsnew"], "firefox/whatsnew/whatsnew-fx91-de.html": ["firefox/whatsnew/whatsnew"], "firefox/whatsnew/whatsnew-fx92-en.html": ["firefox/whatsnew/whatsnew"], @@ -632,18 +625,6 @@ class WhatsnewView(L10nTemplateView): template = "firefox/whatsnew/whatsnew-fx91-en.html" elif version.startswith("91.") and locale == "de": template = "firefox/whatsnew/whatsnew-fx91-de.html" - elif version.startswith("90.") and locale.startswith("en-"): - template = "firefox/whatsnew/whatsnew-fx90-en.html" - elif version.startswith("90.") and locale in ["de", "fr", "it", "nl", "es-ES"]: - template = "firefox/whatsnew/whatsnew-fx90-eu.html" - elif version.startswith("88.") and locale == "en-US": - template = "firefox/whatsnew/whatsnew-fx88-en.html" - elif version.startswith("87.") and locale == "en-US": - template = "firefox/whatsnew/whatsnew-fx87-en.html" - elif version.startswith("86.") and locale.startswith("en-"): - template = "firefox/whatsnew/whatsnew-fx86-en.html" - elif version.startswith("86.") and locale == "de": - template = "firefox/whatsnew/whatsnew-mobile-qrcode-de.html" else: if show_default_account_whatsnew(version) and ftl_file_is_active("firefox/whatsnew/whatsnew-account"): template = "firefox/whatsnew/index-account.html" @@ -657,8 +638,6 @@ class WhatsnewView(L10nTemplateView): class WhatsNewChinaView(WhatsnewView): # specific templates that should not be rendered in China excluded_templates = [ - "firefox/whatsnew/whatsnew-fx87-en.html", - "firefox/whatsnew/whatsnew-fx88-en.html", "firefox/whatsnew/whatsnew-fx92-en.html", "firefox/whatsnew/whatsnew-fx93-v1-en.html", "firefox/whatsnew/whatsnew-fx93-v2-en.html", diff --git a/l10n/configs/pontoon.toml b/l10n/configs/pontoon.toml index b20a9ecc22..7383debe6f 100644 --- a/l10n/configs/pontoon.toml +++ b/l10n/configs/pontoon.toml @@ -171,25 +171,6 @@ locales = [ [[paths]] reference = "en/firefox/whatsnew/whatsnew-account.ftl" l10n = "{locale}/firefox/whatsnew/whatsnew-account.ftl" -[[paths]] - reference = "en/firefox/whatsnew/whatsnew-fx79.ftl" - l10n = "{locale}/firefox/whatsnew/whatsnew-fx79.ftl" -[[paths]] - reference = "en/firefox/whatsnew/whatsnew-fx80.ftl" - l10n = "{locale}/firefox/whatsnew/whatsnew-fx80.ftl" -[[paths]] - reference = "en/firefox/whatsnew/whatsnew-fx81.ftl" - l10n = "{locale}/firefox/whatsnew/whatsnew-fx81.ftl" -[[paths]] - reference = "en/firefox/whatsnew/whatsnew-fx90.ftl" - l10n = "{locale}/firefox/whatsnew/whatsnew-fx90.ftl" - locales = [ - "de", - "fr", - "it", - "nl", - "es-ES" - ] [[paths]] reference = "en/firefox/whatsnew/whatsnew-s2d.ftl" l10n = "{locale}/firefox/whatsnew/whatsnew-s2d.ftl" diff --git a/l10n/en/firefox/whatsnew/whatsnew-fx79.ftl b/l10n/en/firefox/whatsnew/whatsnew-fx79.ftl deleted file mode 100644 index 85b9a7b4cd..0000000000 --- a/l10n/en/firefox/whatsnew/whatsnew-fx79.ftl +++ /dev/null @@ -1,49 +0,0 @@ -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. - -### URL: https://www-dev.allizom.org/firefox/79.0/whatsnew/all/ - -# HTML page title -whatsnew79-page-title = What’s new with { -brand-name-firefox } - -# Main title -whatsnew79-main-title = Keep your data private from everyone – including us -whatsnew79-main-intro = The internet should be a safe place for all. That’s why { -brand-name-firefox } doesn’t follow you around online, and stops others from following you, too. - -# Main CTA button -whatsnew79-primary-cta = Make { -brand-name-firefox } Default - -# Fallback CTA button, shown if Firefox is already a user's default browser -whatsnew79-fallback-cta = Get the { -brand-name-firefox } App - -whatsnew79-secure-your-connection = Secure your connection -whatsnew79-with-one-tap-mozilla-vpn = With one tap, { -brand-name-mozilla-vpn } encrypts your connection to keep your online activity private on any network — safe from hackers and other prying eyes. - -# CTA link -whatsnew79-get-started = Get Started - -whatsnew79-get-more-control-over = Get more control over trackers -whatsnew79-firefox-blocks-more = { -brand-name-firefox } blocks more advertisers and trackers from following you around than ever before. - -# CTA link -whatsnew79-see-your-report = See your Report -whatsnew79-update-your-firefox = Update your { -brand-name-firefox } browser -whatsnew79-download-the-firefox = Download the { -brand-name-firefox } browser -whatsnew79-read-our-privacy-promise = Read our Privacy Promise -whatsnew79-take-less-keep-it-safe = Take less. Keep it safe. No secrets. Our business doesn’t depend on secretly abusing your trust. - -# CTA link -whatsnew79-read-more = Read More -whatsnew79-keep-facebook-contained = Keep { -brand-name-facebook } contained -whatsnew79-get-the-power-to-prevent = Get the power to prevent { -brand-name-facebook } and { -brand-name-instagram } from tracking you around the web. - -# CTA link -whatsnew79-add-facebook-container = Add { -brand-name-facebook-container } - -# Modal title -whatsnew79-get-firefox-on-your-phone = Get { -brand-name-firefox } on your Phone -whatsnew79-scan-the-qr-code = Scan the QR code to get started - -# Accessible text replacement for a QR code image -whatsnew79-qr-code-to-scan = QR code to scan for { -brand-name-firefox } diff --git a/l10n/en/firefox/whatsnew/whatsnew-fx80.ftl b/l10n/en/firefox/whatsnew/whatsnew-fx80.ftl deleted file mode 100644 index 468b4ecc1e..0000000000 --- a/l10n/en/firefox/whatsnew/whatsnew-fx80.ftl +++ /dev/null @@ -1,24 +0,0 @@ -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. - -### URL: https://www-dev.allizom.org/firefox/80.0/whatsnew/all/ - -# html page title -whatsnew80-page-title = What’s new with { -brand-name-firefox } - -whatsnew80-up-to-date-banner = Congrats! You’re using the latest version of { -brand-name-firefox }. - -# Main title -whatsnew80-main-title = Do just about everything, a little faster -whatsnew80-main-intro = Move from computer to phone without missing a beat. Get { -brand-name-firefox } for mobile. - -# content buckets below hero -whatsnew80-password-fatigue = Password fatigue is real -whatsnew80-the-average-person = The average person has 130 online accounts. { -brand-name-firefox } for mobile remembers and stores your passwords safely across synced devices, so you can log in with just one click. - -whatsnew80-privacy-you-never = Privacy you never have to ponder -whatsnew80-firefox-for-mobile = { -brand-name-firefox } for mobile blocks most online ad trackers automatically so there’s no need to dig into your security settings. - -whatsnew80-new-firefox-android = New { -brand-name-firefox } for { -brand-name-android } -whatsnew80-our-latest-version = Our latest version of { -brand-name-firefox } features lightening-fast page loads and a clean new design that makes it easier to get more things done, more quickly. diff --git a/l10n/en/firefox/whatsnew/whatsnew-fx81.ftl b/l10n/en/firefox/whatsnew/whatsnew-fx81.ftl deleted file mode 100644 index 1b0cb88c4a..0000000000 --- a/l10n/en/firefox/whatsnew/whatsnew-fx81.ftl +++ /dev/null @@ -1,20 +0,0 @@ -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. - -### URL: https://www-dev.allizom.org/firefox/81.0/whatsnew/all/ - -# html page title -whatsnew81-page-title = What’s new with { -brand-name-firefox } - -# Main title -whatsnew81-main-title = A new { -brand-name-firefox } for every device -whatsnew81-main-intro = Whatever operating system you’ve got, there’s a better-than-ever, non-profit-backed mobile browser to put on it. -whatsnew81-send-form-label = Enter your email for a download link -whatsnew81-scan-this-qr-code = Scan this QR code to download - -# content blocks below hero -whatsnew81-the-new-firefox-for-android = The NEW { -brand-name-firefox } for { -brand-name-android } is here -whatsnew81-our-latest-for-android-has = Our latest for { -brand-name-android } has lots of fun, smart features – like a moveable search bar. Because we’re an independent browser and we care about your thumbs. -whatsnew81-make-firefox-your-everyday = Make { -brand-name-firefox } your everyday browser on { -brand-name-ios } -whatsnew81-attention-iphone-people = Attention { -brand-name-iphone } people: in { -brand-name-ios } 14, you can finally set { -brand-name-firefox } as your forever go-to, get-it-done, default browser. Make sure you’ve got the latest { -brand-name-firefox } for { -brand-name-ios }. diff --git a/l10n/en/firefox/whatsnew/whatsnew-fx90.ftl b/l10n/en/firefox/whatsnew/whatsnew-fx90.ftl deleted file mode 100644 index 220e979fcb..0000000000 --- a/l10n/en/firefox/whatsnew/whatsnew-fx90.ftl +++ /dev/null @@ -1,29 +0,0 @@ -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. - -### URL: https://www-dev.allizom.org/firefox/90.0/whatsnew/all/ ('de', 'fr', 'it', 'nl', 'es-ES') - -# Line break (
) is for visual formatting only. -whatsnew90-main-heading = Online anywhere.
Protected everywhere. - -whatsnew90-main-body = From coffee shop to campsite, train station to beach — public wifi is convenient, but not always secure. { -brand-name-mozilla-vpn } protects your internet connection and identity no matter where you are. -whatsnew90-main-cta = Get { -brand-name-mozilla-vpn } - -whatsnew90-block-1-heading = Safe & Secure -whatsnew90-block-1-body = Public wifi is one of the easiest ways for hackers to get to your personal info. { -brand-name-mozilla-vpn } encrypts your network activity and hides your location and IP address. - -whatsnew90-block-2-heading = Home is where your VPN is - -# Obsolete string -whatsnew90-block-2-body = Take your entertainment on the road or travel to your entertainment. Connect to 750+ servers in more than 30 countries and stream, play, and surf more securely while staying flexible. - -# Variables: -# $servers (number) - number of available servers -# $countries (number) - number of available countries -whatsnew90-block-2-body-v2 = Take your entertainment on the road or travel to your entertainment. Connect to { $servers }+ servers in more than { $countries } countries and stream, play, and surf more securely while staying flexible. - -whatsnew90-availability-heading = Now available in additional countries including: -whatsnew90-availability-body = Germany, France, Italy, Spain, Belgium, Austria, Switzerland. - -whatsnew90-press-logos-heading = Featured in diff --git a/media/css/firefox/whatsnew/whatsnew-86.scss b/media/css/firefox/whatsnew/whatsnew-86.scss deleted file mode 100644 index 87e611dd18..0000000000 --- a/media/css/firefox/whatsnew/whatsnew-86.scss +++ /dev/null @@ -1,213 +0,0 @@ -// This Source Code Form is subject to the terms of the Mozilla Public -// License, v. 2.0. If a copy of the MPL was not distributed with this -// file, You can obtain one at http://mozilla.org/MPL/2.0/. - -$font-path: '/media/fonts'; -$image-path: '/media/protocol/img'; - -@import '~@mozilla-protocol/core/protocol/css/includes/lib'; -@import '~@mozilla-protocol/core/protocol/css/components/notification-bar'; -@import 'includes/header'; - - -//* -------------------------------------------------------------------------- */ -// Main content -.wnp-content-main { - padding: 0; - text-align: center; - - @media #{$mq-tall} { - padding-top: $layout-md; - margin-bottom: $layout-lg; - } - - .send-to-device { - margin: 0 auto; - } -} - -.wnp-main-image { - margin: 0 auto $layout-sm; - - svg { - max-width: 200px; - height: auto; - } -} - -.wnp-main-title { - @include text-title-md; - color: get-theme('title-text-color'); - - strong { - color: $color-violet-50; - } -} - -.wnp-main-tagline { - @include text-body-lg; -} - - - - -//* -------------------------------------------------------------------------- */ -// Extra content -// To be replaced by revamped picto card. See https://github.com/mozilla/protocol/issues/382 - -.c-picto-block { - @include border-box; - margin: 0 auto $spacing-2xl; - max-width: $content-md - ($layout-md * 2); - padding: 0 $layout-md; - - .c-picto-block-title { - @include text-title-xs; - color: get-theme('title-text-color'); - } - - .c-picto-block-image { - margin: 0 auto $spacing-lg; - max-width: $content-xs; - min-height: $layout-md; - } -} - -@media #{$mq-md} { - .l-columns-two, - .l-columns-three { - display: flex; - margin: 0 auto; - max-width: $content-lg; - padding: 0 $layout-md; - flex-wrap: wrap; - - .c-picto-block { - flex: 1 1 50%; - padding: 0 $layout-lg; - } - } -} - -@media #{$mq-lg} { - .l-columns-three { - display: flex; - margin: 0 auto; - max-width: none; - - .c-picto-block { - flex: 1 1 33.3%; - padding: 0 $layout-xs; - } - } -} - - -//* -------------------------------------------------------------------------- */ -// Utilities (link to release notes) -.c-utilities { - @include text-body-sm; - max-width: $content-md; - padding-bottom: $layout-xl; - text-align: center; -} - - - -//* -------------------------------------------------------------------------- */ -// For dark mode -@media (prefers-color-scheme: dark) { - .content-wrapper { - background: $color-dark-gray-60; - color: $color-white; - } - - .wnp-main-title { - color: get-theme('title-text-color-inverse'); - } - - .wnp-main-image svg .dark { - fill: $color-white; - } - - .send-to-device { - color: get-theme('body-text-color-alt-inverse'); - - .thank-you { - color: get-theme('title-text-color-inverse'); - } - } - - .c-picto-block { - .c-picto-block-title { - color: get-theme('title-text-color-inverse'); - } - - .c-picto-block-image .dark { - fill: get-theme('body-text-color-inverse'); - } - } - - .wnp-content-extra a, - .c-utilities a { - &:link, - &:visited { - color: $color-blue-10; - } - - &:active, - &:focus, - &:hover { - color: $color-white; - } - } - - .c-footer { - background: $color-dark-gray-60; - color: $color-white; - - a:link, - a:visited { - color: $color-light-gray-20; - text-decoration: underline; - - &:hover, - &:focus, - &:active { - color: $color-white; - } - } - - .c-footer-sections { - border-color: $color-dark-gray-30; - } - } - - .c-footer-list-social li { - a.twitter { - background-image: url('/media/protocol/img/icons/social/twitter/white.svg'); - } - - a.instagram { - background-image: url('/media/protocol/img/icons/social/instagram/white.svg'); - } - - a.youtube { - background-image: url('/media/protocol/img/icons/social/youtube/white.svg'); - } - } - - .c-footer-primary-logo a { - background-image: url('/media/protocol/img/logos/mozilla/logo-word-hor-white.svg'); - } - - .c-picto-block-image { - .line { - fill: $color-white; - } - - .building { - fill: #a77ffa; - } - } -} diff --git a/media/css/firefox/whatsnew/whatsnew-87.scss b/media/css/firefox/whatsnew/whatsnew-87.scss deleted file mode 100644 index 18668f0025..0000000000 --- a/media/css/firefox/whatsnew/whatsnew-87.scss +++ /dev/null @@ -1,198 +0,0 @@ -// This Source Code Form is subject to the terms of the Mozilla Public -// License, v. 2.0. If a copy of the MPL was not distributed with this -// file, You can obtain one at http://mozilla.org/MPL/2.0/. - -$font-path: '/media/fonts'; -$image-path: '/media/protocol/img'; - -@import '~@mozilla-protocol/core/protocol/css/includes/lib'; -@import '~@mozilla-protocol/core/protocol/css/components/notification-bar'; -@import 'includes/header'; - - -// Dark color scheme, no respect for user mode this time -.content-wrapper { - background: $color-ink-80; - color: $color-white; - - h1, h2, h3 { - color: $color-white; - } -} - -.c-page-header-logo-fx { - background-image: url('/media/protocol/img/logos/firefox/browser/logo-word-hor-white-sm.png'); -} - -.wnp-main-title { - color: get-theme('title-text-color-inverse'); -} - -.c-picto-block { - .c-picto-block-title { - color: get-theme('title-text-color-inverse'); - } - - .c-picto-block-image .dark { - fill: get-theme('body-text-color-inverse'); - } -} - -.wnp-content-extra a, -.c-utilities a { - &:link, - &:visited { - color: $color-blue-10; - } - - &:active, - &:focus, - &:hover { - color: $color-white; - } -} - - -//* -------------------------------------------------------------------------- */ -// Main content -.wnp-content-main { - padding: 0; - text-align: center; - - @media #{$mq-tall} { - padding-top: $layout-md; - margin-bottom: $layout-lg; - } -} - -.wnp-main-image { - margin: 0 auto $layout-sm; - - svg { - max-width: 200px; - height: auto; - } -} - -.wnp-main-title { - @include text-title-md; - color: get-theme('title-text-color'); - - strong { - color: $color-violet-50; - } -} - -.wnp-main-tagline { - @include text-title-2xs; - color: $color-orange-40; - font-weight: bold; -} - -.wnp-section-heading { - @include text-title-xs; - text-align: center; - margin: 0 auto $layout-lg; -} - -// Video -.video-content { - @include aspect-ratio(16, 9); - - iframe { - height: 100%; - width: 100%; - } - - .video-play { - display: block; - - &:after { - background: url('/media/img/icons/video-play.svg') top left no-repeat; - content: ''; - height: 100px; - left: 50%; - margin: -50px 0 0 -50px; - opacity: 0.7; - position: absolute; - top: 50%; - transition: opacity 150ms ease-in-out, transform 150ms ease-in-out; - width: 100px; - z-index: 2; - } - - &:hover:after, - &:focus:after { - opacity: 1; - transform: scale(1.1); - } - } -} - -// Hide the CTA if JS fails -.no-js .wnp-main-cta { - display: none; -} - - -//* -------------------------------------------------------------------------- */ -// Extra content -// To be replaced by revamped picto card. See https://github.com/mozilla/protocol/issues/382 - -.c-picto-block { - @include border-box; - margin: 0 auto $spacing-2xl; - max-width: $content-md - ($layout-md * 2); - padding: 0 $layout-md; - - .c-picto-block-title { - @include text-title-xs; - color: get-theme('title-text-color-inverse'); - } - - .c-picto-block-image { - margin: 0 auto $spacing-lg; - max-width: 100%; - min-height: $layout-md; - } -} - -@media #{$mq-md} { - .l-columns-two, - .l-columns-three { - display: flex; - margin: 0 auto; - max-width: $content-lg; - padding: 0 $layout-md; - flex-wrap: wrap; - - .c-picto-block { - flex: 1 1 50%; - padding: 0 $layout-lg; - } - } -} - -@media #{$mq-lg} { - .l-columns-three { - display: flex; - margin: 0 auto; - max-width: none; - - .c-picto-block { - flex: 1 1 33.3%; - padding: 0 $layout-xs; - } - } -} - - -//* -------------------------------------------------------------------------- */ -// Utilities (link to release notes) -.c-utilities { - @include text-body-sm; - max-width: $content-md; - padding-bottom: $layout-xl; - text-align: center; -} - diff --git a/media/css/firefox/whatsnew/whatsnew-88-en.scss b/media/css/firefox/whatsnew/whatsnew-88-en.scss deleted file mode 100644 index b39dcd8a11..0000000000 --- a/media/css/firefox/whatsnew/whatsnew-88-en.scss +++ /dev/null @@ -1,152 +0,0 @@ -// This Source Code Form is subject to the terms of the Mozilla Public -// License, v. 2.0. If a copy of the MPL was not distributed with this -// file, You can obtain one at http://mozilla.org/MPL/2.0/. - -$font-path: '/media/fonts'; -$image-path: '/media/protocol/img'; - -@import '~@mozilla-protocol/core/protocol/css/includes/lib'; -@import '~@mozilla-protocol/core/protocol/css/components/notification-bar'; -@import 'includes/header'; - - -// Override _header.scss since this page doesn't support dark mode -@media (prefers-color-scheme: dark) { - .c-page-header-logo-fx { - background-image: url($image-path + '/logos/firefox/browser/logo-word-hor-sm.png'); - } -} - -//* -------------------------------------------------------------------------- */ -// Main content -.wnp-content-main { - padding: 0; - text-align: center; -} - -.wnp-main-image { - margin: 0 auto $layout-sm; -} - -.c-animated-graphic { - width: 100%; - max-width: 450px; - display: block; - margin: 0 auto $layout-sm; - - &.wnp-vid-1 { - max-width: 620px; - } -} - -.wnp-main-title { - @include text-title-md; - color: get-theme('title-text-color'); - max-width: 750px; - margin-left: auto; - margin-right: auto; - - strong { - color: $color-violet-50; - } -} - -.wnp-main-tagline { - @include text-body-lg; - max-width: $content-md; - margin-left: auto; - margin-right: auto; -} - -.wnp-platforms { - text-align: center; - margin: 0 auto $layout-lg; - max-width: $content-md; - - h2 { - @include text-title-xs; - margin-bottom: $spacing-lg; - } - - svg { - height: 48px; - display: inline-block; - margin: 0 $spacing-sm; - - .dark { - fill: get-theme('body-text-color'); - } - } -} - - -//* -------------------------------------------------------------------------- */ -// Extra content -// To be replaced by revamped picto card. See https://github.com/mozilla/protocol/issues/382 - -.c-picto-block { - @include border-box; - margin: 0 auto $spacing-2xl; - max-width: $content-md - ($layout-md * 2); - padding: 0 $layout-md; - - .c-picto-block-title { - @include text-title-xs; - color: get-theme('title-text-color'); - } - - .c-picto-block-image { - align-items: center; - display: flex; - justify-content: center; - margin: 0 auto $spacing-lg; - max-width: $content-xs; - min-height: $layout-md; - } -} - -@media #{$mq-md} { - .l-columns-two, - .l-columns-three { - display: flex; - margin: 0 auto; - max-width: $content-lg; - padding: 0 $layout-md; - flex-wrap: wrap; - - .c-picto-block { - flex: 1 1 50%; - padding: 0 $layout-lg; - } - } -} - -@media #{$mq-lg} { - .l-columns-three { - display: flex; - margin: 0 auto; - max-width: none; - - .c-picto-block { - flex: 1 1 33.3%; - padding: 0 $layout-xs; - } - } -} - - -//* -------------------------------------------------------------------------- */ -// Utilities (link to release notes) -.c-utilities { - @include text-body-sm; - max-width: $content-md; - padding-bottom: $layout-xl; - text-align: center; -} - -//* -------------------------------------------------------------------------- */ -// Flux -.flux { - display: inline-block; - cursor: url("/media/img/firefox/whatsnew/whatsnew88-en/flux.cur"), pointer; -} diff --git a/media/css/firefox/whatsnew/whatsnew-90-eu.scss b/media/css/firefox/whatsnew/whatsnew-90-eu.scss deleted file mode 100644 index 72ba4a117d..0000000000 --- a/media/css/firefox/whatsnew/whatsnew-90-eu.scss +++ /dev/null @@ -1,200 +0,0 @@ -// This Source Code Form is subject to the terms of the Mozilla Public -// License, v. 2.0. If a copy of the MPL was not distributed with this -// file, You can obtain one at http://mozilla.org/MPL/2.0/. - -$font-path: '/media/fonts'; -$image-path: '/media/protocol/img'; - -@import '~@mozilla-protocol/core/protocol/css/includes/lib'; -@import '~@mozilla-protocol/core/protocol/css/includes/forms/lib'; -@import '~@mozilla-protocol/core/protocol/css/components/inline-list'; -@import '~@mozilla-protocol/core/protocol/css/components/notification-bar'; -@import '~@mozilla-protocol/core/protocol/css/components/picto'; -@import '~@mozilla-protocol/core/protocol/css/components/split'; -@import '~@mozilla-protocol/core/protocol/css/templates/multi-column'; -@import 'includes/header'; - - -//* -------------------------------------------------------------------------- */ -// Main content -.wnp-content-main { - margin-bottom: $layout-xl; - padding: 0; - text-align: center; -} - -.mozilla-vpn-logo { - margin: 0 auto $layout-sm; -} - -.wnp-main-heading { - @include text-title-md; - color: get-theme('title-text-color'); - margin-left: auto; - margin-right: auto; - max-width: 750px; - - strong { - color: $color-violet-50; - } -} - -.wnp-main-body { - @include text-body-lg; - margin-left: auto; - margin-right: auto; - max-width: $content-md; -} - -.mzp-c-picto { - max-width: $content-sm; -} - -.mzp-c-picto-image { - text-align: center; -} - -.c-availability { - margin: $layout-xl 0 0; - - .c-availability-heading { - @include text-title-xs; - margin: 0 auto .5em; - max-width: 18em; - text-align: center; - } -} - -.c-press-logos { - margin: $layout-xl 0; - text-align: center; - - .c-press-logos-heading { - @include font-base; - @include font-size(18px); - font-weight: normal; - } -} - -//* -------------------------------------------------------------------------- */ -// Utilities (link to release notes) -.c-utilities { - @include text-body-sm; - max-width: $content-md; - padding-bottom: $layout-xl; - text-align: center; -} - -//* -------------------------------------------------------------------------- */ -// For dark mode -@media (prefers-color-scheme: dark) { - - html, - .content-wrapper { - background: $color-dark-gray-60; - color: $color-white; - } - - .mozilla-vpn-wordmark, - .mozilla-vpn-icon { - fill: $color-white; - } - - .wnp-content-extra svg { - .line { - fill: $color-white; - } - - .stroke { - stroke: $color-white; - } - } - - .wnp-main-heading { - color: get-theme('title-text-color-inverse'); - } - - .c-utilities a { - &:link, - &:visited { - color: $color-blue-10; - } - - &:active, - &:focus, - &:hover { - color: $color-white; - } - } - - .mzp-c-picto .mzp-c-picto-heading, - .c-availability-heading, - .c-press-logos-heading { - color: get-theme('title-text-color-inverse'); - } - - .c-availability { - .mzp-c-button.mzp-t-product.mzp-t-secondary { - background-color: rgba($color-white, .3); - border-color: transparent; - color: $color-white; - - &:focus { - border-color: $button-border-color-focus; - box-shadow: $field-focus-ring; - } - - &:hover { - background-color: $color-blue-60; - border-color: transparent; - box-shadow: none; - color: $color-white; - } - - &:active { - background-color: $color-blue-80; - border-color: transparent; - color: $color-white; - } - } - } - - .c-footer { - background: $color-dark-gray-60; - color: $color-white; - - a:link, - a:visited { - color: $color-light-gray-20; - text-decoration: underline; - - &:hover, - &:focus, - &:active { - color: $color-white; - } - } - - .c-footer-sections { - border-color: $color-dark-gray-30; - } - } - - .c-footer-list-social li { - a.twitter { - background-image: url('/media/protocol/img/icons/social/twitter/white.svg'); - } - - a.instagram { - background-image: url('/media/protocol/img/icons/social/instagram/white.svg'); - } - - a.youtube { - background-image: url('/media/protocol/img/icons/social/youtube/white.svg'); - } - } - - .c-footer-primary-logo a { - background-image: url('/media/protocol/img/logos/mozilla/logo-word-hor-white.svg'); - } -} diff --git a/media/css/firefox/whatsnew/whatsnew-90.scss b/media/css/firefox/whatsnew/whatsnew-90.scss deleted file mode 100644 index fb1682199c..0000000000 --- a/media/css/firefox/whatsnew/whatsnew-90.scss +++ /dev/null @@ -1,225 +0,0 @@ -// This Source Code Form is subject to the terms of the Mozilla Public -// License, v. 2.0. If a copy of the MPL was not distributed with this -// file, You can obtain one at http://mozilla.org/MPL/2.0/. - -$font-path: '/media/fonts'; -$image-path: '/media/protocol/img'; - -@import '~@mozilla-protocol/core/protocol/css/includes/lib'; -@import '~@mozilla-protocol/core/protocol/css/components/notification-bar'; -@import '~@mozilla-protocol/core/protocol/css/templates/multi-column'; -@import '~@mozilla-protocol/core/protocol/css/components/picto'; -@import 'includes/header'; - - -//* -------------------------------------------------------------------------- */ -// Main content -.wnp-content-main { - padding: 0; - text-align: center; -} - -.wnp-main-image { - margin: 0 auto $layout-sm; -} - -.wnp-main-title { - @include text-title-md; - color: get-theme('title-text-color'); -} - -.wnp-main-tagline { - @include text-body-lg; - - .inline-icon { - height: 1em; - margin-bottom: -.1em; - vertical-align: baseline; - width: 1em; - } -} - -.wnp-main-cta { - margin-top: $layout-md; -} - -.c-sub-cta { - @include text-body-sm; - margin-top: $spacing-sm; -} - - -//* -------------------------------------------------------------------------- */ -// Extra content - -.mzp-c-picto { - text-align: center; - max-width: $content-sm; - - @media #{$mq-md} { - @include bidi(((text-align, left, right),)); - } -} - -.mzp-c-picto-image { - align-items: flex-end; - display: flex; - height: 250px; - justify-content: center; - margin: 0 auto $spacing-lg; - max-width: $content-xs; - min-height: $layout-md; -} - -.wnp-content-footer { - text-align: center; - - .wnp-footer-title { - @include text-title-md; - margin-bottom: $layout-md; - } -} - - -//* -------------------------------------------------------------------------- */ -// Utilities (link to release notes) -.c-utilities { - @include text-body-sm; - max-width: $content-md; - padding-bottom: $layout-xl; - text-align: center; -} - - -//* -------------------------------------------------------------------------- */ -// Footer overrides -.c-footer { - background: $color-white; - color: $color-ink-80; - - a:link, - a:visited { - color: $color-ink-80; - } - - a:hover, - a:focus, - a:active { - color: $color-ink-90; - } - - .c-footer-sections { - border-top: 1px solid $color-light-gray-30; - border-bottom: 1px solid $color-light-gray-30; - padding: $layout-md 0; - } -} - -.c-footer-list-social li { - a.twitter { - background-image: url('/media/protocol/img/icons/social/twitter/black.svg'); - } - - a.instagram { - background-image: url('/media/protocol/img/icons/social/instagram/black.svg'); - } - - a.youtube { - background-image: url('/media/protocol/img/icons/social/youtube/black.svg'); - } -} - -.c-footer-primary-logo a { - background-image: url('/media/protocol/img/logos/mozilla/logo-word-hor.svg'); -} - - -//* -------------------------------------------------------------------------- */ -// For dark mode -@media (prefers-color-scheme: dark) { - .content-wrapper { - background: $color-dark-gray-60; - color: $color-white; - } - - .wnp-main-image { - @include border-box; - background: transparent url('/media/protocol/img/logos/pocket/logo-word-hor-white.svg') center top no-repeat; - @include background-size(220px, auto); - display: inline-block; - height: 60px; - overflow: hidden; - padding-top: 60px; - } - - .wnp-main-tagline .inline-icon { - @include border-box; - background: transparent url('/media/img/firefox/whatsnew/whatsnew90/pocket-outline-white.svg') center top no-repeat; - @include background-size(1em, auto); - display: inline-block; - height: 1em; - overflow: hidden; - padding-top: 1em; - } - - .wnp-main-title, - .wnp-footer-title, - .mzp-c-picto-heading { - color: get-theme('title-text-color-inverse'); - } - - .c-utilities, - .c-sub-cta { - @include white-links; - } - - .c-footer { - background: $color-dark-gray-60; - color: $color-white; - - a:link, - a:visited, - a:hover, - a:focus, - a:active { - color: $color-white; - } - - .c-footer-sections { - border-color: $color-dark-gray-30; - } - } - - .c-footer-list-social li { - a.twitter { - background-image: url('/media/protocol/img/icons/social/twitter/white.svg'); - } - - a.instagram { - background-image: url('/media/protocol/img/icons/social/instagram/white.svg'); - } - - a.youtube { - background-image: url('/media/protocol/img/icons/social/youtube/white.svg'); - } - } - - .c-footer-primary-logo a { - background-image: url('/media/protocol/img/logos/mozilla/logo-word-hor-white.svg'); - } - - .mzp-c-picto-image { - .paper-inner { - fill: $color-dark-gray-60; - } - - .paper-outer { - fill: #fffbe3; - } - - .paper-outer-stroke, - .drink-stroke { - stroke: #fffbe3; - } - } -} diff --git a/media/js/firefox/whatsnew/whatsnew-86.js b/media/js/firefox/whatsnew/whatsnew-86.js deleted file mode 100644 index bc379d5df9..0000000000 --- a/media/js/firefox/whatsnew/whatsnew-86.js +++ /dev/null @@ -1,16 +0,0 @@ -/* This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ - -// create namespace -if (typeof window.Mozilla === 'undefined') { - window.Mozilla = {}; -} - -(function (Mozilla) { - 'use strict'; - - // initialize send to device widget - var form = new Mozilla.SendToDevice(); - form.init(); -})(window.Mozilla); diff --git a/media/js/firefox/whatsnew/whatsnew-87.js b/media/js/firefox/whatsnew/whatsnew-87.js deleted file mode 100644 index 54e50e811e..0000000000 --- a/media/js/firefox/whatsnew/whatsnew-87.js +++ /dev/null @@ -1,134 +0,0 @@ -/* This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ - -/* global YT */ -/* eslint no-unused-vars: [2, { "varsIgnorePattern": "onYouTubeIframeAPIReady" }] */ - -// YouTube API hook has to be in global scope -window.onYouTubeIframeAPIReady = function () { - 'use strict'; - - // Play the video only once the API is ready. - if (Mozilla.pipVideoPlay.videoId) { - Mozilla.pipVideoPlay( - Mozilla.pipVideoPlay.playerId, - Mozilla.pipVideoPlay.videoId, - Mozilla.pipVideoPlay.videoTitle - ); - } -}; - -(function () { - 'use strict'; - - var src = 'https://www.youtube.com/iframe_api'; - - function loadScript() { - var tag = document.createElement('script'); - tag.src = src; - var firstScriptTag = document.getElementsByTagName('script')[0]; - firstScriptTag.parentNode.insertBefore(tag, firstScriptTag); - } - - function isScriptLoaded() { - return document.querySelector('script[src="' + src + '"]') - ? true - : false; - } - - function playVideo(playerId, videoId, videoTitle) { - new YT.Player(playerId, { - width: 640, - height: 360, - videoId: videoId, - playerVars: { - modestbranding: 1, // hide YouTube logo. - rel: 0 // do not show related videos on end. - }, - events: { - onReady: onPlayerReady, - onStateChange: onPlayerStateChange - } - }); - - function onPlayerReady(event) { - event.target.playVideo(playerId, videoId, videoTitle); - } - - function onPlayerStateChange(event) { - var state; - - switch (event.data) { - case YT.PlayerState.PLAYING: - state = 'video play'; - break; - case YT.PlayerState.PAUSED: - state = 'video paused'; - break; - case YT.PlayerState.ENDED: - state = 'video complete'; - break; - } - - if (state) { - window.dataLayer.push({ - event: 'video-interaction', - videoTitle: videoTitle, - interaction: state - }); - } - } - } - - function initVideoPlayer(playerId, videoId, videoTitle) { - // check to see if you youtube API is loaded before trying to play the video. - if (!isScriptLoaded()) { - loadScript(); - } else { - playVideo(playerId, videoId, videoTitle); - } - } - - function init() { - var videoLinks = document.querySelectorAll('.js-video-play'); - var tryButton = document.getElementById('try-button'); - - tryButton.addEventListener('click', function (e) { - Mozilla.pipVideoPlay.playerId = 'player1'; - Mozilla.pipVideoPlay.videoId = tryButton.getAttribute('data-id'); - Mozilla.pipVideoPlay.videoTitle = - tryButton.getAttribute('data-video-title'); - e.preventDefault(); - this.setAttribute('disabled', ''); - initVideoPlayer( - Mozilla.pipVideoPlay.playerId, - Mozilla.pipVideoPlay.videoId, - Mozilla.pipVideoPlay.videoTitle - ); - }); - - for (var i = 0; i < videoLinks.length; i++) { - videoLinks[i].setAttribute('role', 'button'); - videoLinks[i].addEventListener('click', function (e) { - Mozilla.pipVideoPlay.playerId = this.getAttribute('id'); - Mozilla.pipVideoPlay.videoId = this.getAttribute('data-id'); - Mozilla.pipVideoPlay.videoTitle = - this.getAttribute('data-video-title'); - e.preventDefault(); - initVideoPlayer( - Mozilla.pipVideoPlay.playerId, - Mozilla.pipVideoPlay.videoId, - Mozilla.pipVideoPlay.videoTitle - ); - }); - } - } - - Mozilla.pipVideoPlay = playVideo; - Mozilla.pipVideoPlay.playerId; - Mozilla.pipVideoPlay.videoId; - Mozilla.pipVideoPlay.videoTitle; - - init(); -})(); diff --git a/media/js/firefox/whatsnew/whatsnew-88-en.js b/media/js/firefox/whatsnew/whatsnew-88-en.js deleted file mode 100644 index ed52641552..0000000000 --- a/media/js/firefox/whatsnew/whatsnew-88-en.js +++ /dev/null @@ -1,17 +0,0 @@ -/* This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ - -(function () { - 'use strict'; - - var jingle = function () { - button.style.fontStyle = 'italic'; - var audio = new Audio(button.dataset.audio); - audio.play(); - }; - - var button = document.getElementById('outatime'); - - button.addEventListener('click', jingle); -})(window.Mozilla); diff --git a/media/js/firefox/whatsnew/whatsnew-id.js b/media/js/firefox/whatsnew/whatsnew-id.js deleted file mode 100644 index b759307b44..0000000000 --- a/media/js/firefox/whatsnew/whatsnew-id.js +++ /dev/null @@ -1,28 +0,0 @@ -/* This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ - -(function () { - 'use strict'; - - var client = Mozilla.Client; - var form = new Mozilla.SendToDevice('download-firefox-rocket'); - form.init(); - - function checkUpToDate() { - // bug 1419573 - only show "Your Firefox is up to date" if it's the latest version. - if (client.isFirefoxDesktop) { - client.getFirefoxDetails(function (data) { - if (data.isUpToDate) { - document - .querySelector('.c-page-header') - .classList.add('show-up-to-date-message'); - } - }); - } - } - - Mozilla.UITour.ping(function () { - checkUpToDate(); - }); -})(); diff --git a/media/js/firefox/whatsnew/whatsnew90-experiment.js b/media/js/firefox/whatsnew/whatsnew90-experiment.js deleted file mode 100644 index 34974ca021..0000000000 --- a/media/js/firefox/whatsnew/whatsnew90-experiment.js +++ /dev/null @@ -1,39 +0,0 @@ -/* This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ - -(function (Mozilla) { - 'use strict'; - /* update dataLayer with experiment info */ - var href = window.location.href; - - var initTrafficCop = function () { - if (href.indexOf('v=') !== -1) { - if (href.indexOf('v=1') !== -1) { - window.dataLayer.push({ - 'data-ex-variant': 'whatsnew90-variant-1', - 'data-ex-name': 'whatsnew90-cta-experiment' - }); - } else if (href.indexOf('v=2') !== -1) { - window.dataLayer.push({ - 'data-ex-variant': 'whatsnew90-variant-2', - 'data-ex-name': 'whatsnew90-cta-experiment' - }); - } - } else if (Mozilla.TrafficCop) { - var cop = new Mozilla.TrafficCop({ - id: 'whatsnew90_experiment_cta', - cookieExpires: 0, - variations: { - 'v=1': 90, - 'v=2': 10 - } - }); - cop.init(); - } - }; - - if (href.indexOf('automation=true') === -1) { - initTrafficCop(); - } -})(window.Mozilla); diff --git a/media/static-bundles.json b/media/static-bundles.json index 7b0efdbaed..dd3e98b459 100644 --- a/media/static-bundles.json +++ b/media/static-bundles.json @@ -366,19 +366,6 @@ ], "name": "firefox_whatsnew_account" }, - { - "files": [ - "css/protocol/components/send-to-device.scss", - "css/firefox/whatsnew/whatsnew-mobile-de.scss" - ], - "name": "firefox_whatsnew_mobile_de" - }, - { - "files": [ - "css/firefox/whatsnew/whatsnew-mobile-qrcode-de.scss" - ], - "name": "firefox_whatsnew_mobile_qrcode_de" - }, { "files": [ "css/firefox/firstrun/nightly.scss" @@ -397,37 +384,6 @@ ], "name": "flashback" }, - { - "files": [ - "css/protocol/components/send-to-device.scss", - "css/firefox/whatsnew/whatsnew-86.scss" - ], - "name": "firefox_whatsnew_86" - }, - { - "files": [ - "css/firefox/whatsnew/whatsnew-87.scss" - ], - "name": "firefox_whatsnew_87" - }, - { - "files": [ - "css/firefox/whatsnew/whatsnew-88-en.scss" - ], - "name": "firefox_whatsnew_88_en" - }, - { - "files": [ - "css/firefox/whatsnew/whatsnew-90.scss" - ], - "name": "firefox_whatsnew_90" - }, - { - "files": [ - "css/firefox/whatsnew/whatsnew-90-eu.scss" - ], - "name": "firefox_whatsnew_90_eu" - }, { "files": [ "css/firefox/whatsnew/whatsnew-91-en.scss" @@ -1089,43 +1045,6 @@ ], "name": "firefox_welcome_page8_traffic_cop" }, - { - "files": [ - "js/firefox/whatsnew/up-to-date.js", - "js/base/send-to-device.js", - "js/firefox/whatsnew/whatsnew-86.js" - ], - "name": "firefox_whatsnew_86" - }, - { - "files": [ - "js/firefox/whatsnew/up-to-date.js", - "js/firefox/whatsnew/whatsnew-87.js" - ], - "name": "firefox_whatsnew_87" - }, - { - "files": [ - "js/firefox/whatsnew/up-to-date.js", - "js/firefox/whatsnew/whatsnew-88-en.js" - ], - "name": "firefox_whatsnew_88_en" - }, - { - "files": [ - "js/firefox/whatsnew/up-to-date.js", - "js/base/mozilla-fxa-product-button.js", - "js/base/mozilla-fxa-product-button-init.js" - ], - "name": "firefox_whatsnew_90" - }, - { - "files": [ - "js/libs/mozilla-traffic-cop.js", - "js/firefox/whatsnew/whatsnew90-experiment.js" - ], - "name": "firefox_whatsnew90_experiment" - }, { "files": [ "js/firefox/whatsnew/up-to-date.js", diff --git a/tests/functional/firefox/whatsnew/test_whatsnew_86.py b/tests/functional/firefox/whatsnew/test_whatsnew_86.py deleted file mode 100644 index 0af70a15e8..0000000000 --- a/tests/functional/firefox/whatsnew/test_whatsnew_86.py +++ /dev/null @@ -1,34 +0,0 @@ -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. - -import pytest - -from pages.firefox.whatsnew.whatsnew_86 import FirefoxWhatsNew86Page - - -@pytest.mark.skip_if_not_firefox(reason="Whatsnew pages are shown to Firefox only.") -@pytest.mark.nondestructive -def test_send_to_device_success_en(base_url, selenium): - page = FirefoxWhatsNew86Page(selenium, base_url, locale="en-US").open() - send_to_device = page.send_to_device - send_to_device.type_email("success@example.com") - send_to_device.click_send() - assert send_to_device.send_successful - - -@pytest.mark.skip_if_not_firefox(reason="Whatsnew pages are shown to Firefox only.") -@pytest.mark.nondestructive -def test_send_to_device_failure_en(base_url, selenium): - page = FirefoxWhatsNew86Page(selenium, base_url, locale="en-US").open() - send_to_device = page.send_to_device - send_to_device.type_email("invalid@email") - send_to_device.click_send(expected_result="error") - assert send_to_device.is_form_error_displayed - - -@pytest.mark.skip_if_not_firefox(reason="Whatsnew pages are shown to Firefox only.") -@pytest.mark.nondestructive -def test_qr_code_is_displayed(base_url, selenium): - page = FirefoxWhatsNew86Page(selenium, base_url, locale="de").open() - assert page.is_qrcode_displayed diff --git a/tests/functional/firefox/whatsnew/test_whatsnew_90.py b/tests/functional/firefox/whatsnew/test_whatsnew_90.py deleted file mode 100644 index ea65a3a99a..0000000000 --- a/tests/functional/firefox/whatsnew/test_whatsnew_90.py +++ /dev/null @@ -1,14 +0,0 @@ -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. - -import pytest - -from pages.firefox.whatsnew.whatsnew_90 import FirefoxWhatsNew90Page - - -@pytest.mark.skip_if_not_firefox(reason="Whatsnew pages are shown to Firefox only.") -@pytest.mark.nondestructive -def test_get_vpn_button_is_displayed(base_url, selenium): - page = FirefoxWhatsNew90Page(selenium, base_url, locale="de").open() - assert page.is_get_vpn_button_displayed diff --git a/tests/pages/firefox/whatsnew/whatsnew_86.py b/tests/pages/firefox/whatsnew/whatsnew_86.py deleted file mode 100644 index 3832b581e8..0000000000 --- a/tests/pages/firefox/whatsnew/whatsnew_86.py +++ /dev/null @@ -1,23 +0,0 @@ -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. - -from selenium.webdriver.common.by import By - -from pages.base import BasePage -from pages.regions.send_to_device import SendToDevice - - -class FirefoxWhatsNew86Page(BasePage): - - _URL_TEMPLATE = "/{locale}/firefox/86.0/whatsnew/all/" - - _qrcode_locator = (By.CSS_SELECTOR, ".wnp-qr-code-wrapper > svg") - - @property - def send_to_device(self): - return SendToDevice(self) - - @property - def is_qrcode_displayed(self): - return self.is_element_displayed(*self._qrcode_locator) diff --git a/tests/pages/firefox/whatsnew/whatsnew_90.py b/tests/pages/firefox/whatsnew/whatsnew_90.py deleted file mode 100644 index 5b17bffe69..0000000000 --- a/tests/pages/firefox/whatsnew/whatsnew_90.py +++ /dev/null @@ -1,18 +0,0 @@ -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. - -from selenium.webdriver.common.by import By - -from pages.base import BasePage - - -class FirefoxWhatsNew90Page(BasePage): - - _URL_TEMPLATE = "/{locale}/firefox/90.0/whatsnew/all/" - - _get_vpn_button_locator = (By.CSS_SELECTOR, ".wnp-main-cta > .mzp-c-button") - - @property - def is_get_vpn_button_displayed(self): - return self.is_element_displayed(*self._get_vpn_button_locator)