{{ form['remove_all'] }}
- {{ form.remove_all.label_tag(_('Remove me from all Mozilla emails')) }}
+ {{ form.remove_all.label_tag(_('Remove me from all the subscriptions on this page')) }}
diff --git a/bedrock/newsletter/templates/newsletter/fxa-error.html b/bedrock/newsletter/templates/newsletter/fxa-error.html
new file mode 100644
index 00000000000..420ce00332a
--- /dev/null
+++ b/bedrock/newsletter/templates/newsletter/fxa-error.html
@@ -0,0 +1,20 @@
+{% extends 'newsletter/base.html' %}
+
+{% set_lang_files "mozorg/newsletters" %}
+
+{# "noindex" pages should not have the canonical or hreflang tags: bug 1442331 #}
+{% block canonical_urls %}
{% endblock %}
+
+{% block body_id %}newsletter-fxa-error{% endblock body_id %}
+
+{% block content %}
+ {% block main_feature %}
+
+
{{ _('Manage your Newsletter Subscriptions ') }}
+
+ {% endblock %}
+
+
+ {{ _('We are sorry, but there was a problem with our system. Please try again later!') }}
+
+{% endblock %}
diff --git a/bedrock/newsletter/tests/test_views.py b/bedrock/newsletter/tests/test_views.py
index 19881706800..e5450e8ca15 100644
--- a/bedrock/newsletter/tests/test_views.py
+++ b/bedrock/newsletter/tests/test_views.py
@@ -95,9 +95,9 @@ def test_will_show_confirm_copy(self, get_newsletters, mock_basket_request):
url = "%s?confirm=1" % reverse('newsletter.existing.token', args=(self.token,))
# noinspection PyUnresolvedReferences
with patch.multiple('basket',
- user=DEFAULT) as basket_patches:
+ request=DEFAULT) as basket_patches:
with patch('lib.l10n_utils.render') as render:
- basket_patches['user'].return_value = self.user
+ basket_patches['request'].return_value = self.user
render.return_value = HttpResponse('')
self.client.get(url)
request, template_name, context = render.call_args[0]
@@ -114,9 +114,9 @@ def test_get_token(self, get_newsletters, mock_basket_request):
update_user=DEFAULT,
subscribe=DEFAULT,
unsubscribe=DEFAULT,
- user=DEFAULT) as basket_patches:
+ request=DEFAULT) as basket_patches:
with patch('lib.l10n_utils.render') as render:
- basket_patches['user'].return_value = self.user
+ basket_patches['request'].return_value = self.user
render.return_value = HttpResponse('')
self.client.get(url)
request, template_name, context = render.call_args[0]
@@ -139,9 +139,9 @@ def test_show(self, get_newsletters, mock_basket_request):
update_user=DEFAULT,
subscribe=DEFAULT,
unsubscribe=DEFAULT,
- user=DEFAULT) as basket_patches:
+ request=DEFAULT) as basket_patches:
with patch('lib.l10n_utils.render') as render:
- basket_patches['user'].return_value = self.user
+ basket_patches['request'].return_value = self.user
render.return_value = HttpResponse('')
self.client.get(url)
request, template_name, context = render.call_args[0]
@@ -175,11 +175,11 @@ def test_get_user_not_found(self, mock_basket_request):
rand_token = str(uuid.uuid4())
url = reverse('newsletter.existing.token', args=(rand_token,))
with patch.multiple('basket',
- user=DEFAULT) as basket_patches:
+ request=DEFAULT) as basket_patches:
with patch('lib.l10n_utils.render') as render:
render.return_value = HttpResponse('')
with patch('django.contrib.messages.add_message') as add_msg:
- basket_patches['user'].side_effect = basket.BasketException
+ basket_patches['request'].side_effect = basket.BasketException
rsp = self.client.get(url)
# Should have given a message
self.assertEqual(1, add_msg.call_count,
@@ -193,10 +193,10 @@ def test_invalid_token(self, mock_basket_request):
# recovery *without* calling Exact Target
token = "not a token"
url = reverse('newsletter.existing.token', args=(token,))
- with patch.multiple('basket', user=DEFAULT) as basket_patches:
+ with patch.multiple('basket', request=DEFAULT) as basket_patches:
with patch('django.contrib.messages.add_message') as add_msg:
rsp = self.client.get(url, follow=False)
- self.assertEqual(0, basket_patches['user'].call_count)
+ self.assertEqual(0, basket_patches['request'].call_count)
self.assertEqual(1, add_msg.call_count)
self.assertEqual(302, rsp.status_code)
self.assertTrue(rsp['Location'].endswith(reverse('newsletter.recovery')))
@@ -210,11 +210,11 @@ def test_post_user_not_found(self, mock_basket_request):
update_user=DEFAULT,
subscribe=DEFAULT,
unsubscribe=DEFAULT,
- user=DEFAULT) as basket_patches:
+ request=DEFAULT) as basket_patches:
with patch('lib.l10n_utils.render') as render:
render.return_value = HttpResponse('')
with patch('django.contrib.messages.add_message') as add_msg:
- basket_patches['user'].side_effect = basket.BasketException
+ basket_patches['request'].side_effect = basket.BasketException
rsp = self.client.post(url, self.data)
# Shouldn't call basket except for the attempt to find the user
self.assertEqual(0, basket_patches['update_user'].call_count)
@@ -240,10 +240,10 @@ def test_subscribing(self, get_newsletters, mock_basket_request):
update_user=DEFAULT,
subscribe=DEFAULT,
unsubscribe=DEFAULT,
- user=DEFAULT) as basket_patches:
+ request=DEFAULT) as basket_patches:
with patch('django.contrib.messages.add_message') as add_msg:
with patch('lib.l10n_utils.render'):
- basket_patches['user'].return_value = self.user
+ basket_patches['request'].return_value = self.user
rsp = self.client.post(url, self.data)
# Should have given no messages
self.assertEqual(0, add_msg.call_count,
@@ -272,9 +272,9 @@ def test_unsubscribing(self, get_newsletters, mock_basket_request):
update_user=DEFAULT,
subscribe=DEFAULT,
unsubscribe=DEFAULT,
- user=DEFAULT) as basket_patches:
+ request=DEFAULT) as basket_patches:
with patch('lib.l10n_utils.render'):
- basket_patches['user'].return_value = self.user
+ basket_patches['request'].return_value = self.user
rsp = self.client.post(url, self.data)
# Should have called update_user with list of newsletters
self.assertEqual(1, basket_patches['update_user'].call_count)
@@ -301,9 +301,9 @@ def test_remove_all(self, get_newsletters, mock_basket_request):
update_user=DEFAULT,
subscribe=DEFAULT,
unsubscribe=DEFAULT,
- user=DEFAULT) as basket_patches:
+ request=DEFAULT) as basket_patches:
with patch('lib.l10n_utils.render'):
- basket_patches['user'].return_value = self.user
+ basket_patches['request'].return_value = self.user
rsp = self.client.post(url, self.data)
# Should not have updated user details at all
self.assertEqual(0, basket_patches['update_user'].call_count)
@@ -330,10 +330,10 @@ def test_change_lang_country(self, get_newsletters, mock_basket_request):
with patch.multiple('basket',
update_user=DEFAULT,
subscribe=DEFAULT,
- user=DEFAULT) as basket_patches:
+ request=DEFAULT) as basket_patches:
with patch('lib.l10n_utils.render'):
with patch('django.contrib.messages.add_message') as add_msg:
- basket_patches['user'].return_value = self.user
+ basket_patches['request'].return_value = self.user
rsp = self.client.post(url, self.data)
# We have an existing user with a change to their email data,
@@ -369,9 +369,9 @@ def test_newsletter_ordering(self, get_newsletters, mock_basket_request):
update_user=DEFAULT,
subscribe=DEFAULT,
unsubscribe=DEFAULT,
- user=DEFAULT) as basket_patches:
+ request=DEFAULT) as basket_patches:
with patch('lib.l10n_utils.render') as render:
- basket_patches['user'].return_value = self.user
+ basket_patches['request'].return_value = self.user
render.return_value = HttpResponse('')
self.client.get(url)
request, template_name, context = render.call_args[0]
@@ -398,9 +398,9 @@ def test_newsletter_no_order(self, get_newsletters, mock_basket_request):
update_user=DEFAULT,
subscribe=DEFAULT,
unsubscribe=DEFAULT,
- user=DEFAULT) as basket_patches:
+ request=DEFAULT) as basket_patches:
with patch('lib.l10n_utils.render') as render:
- basket_patches['user'].return_value = self.user
+ basket_patches['request'].return_value = self.user
render.return_value = HttpResponse('')
self.client.get(url)
request, template_name, context = render.call_args[0]
diff --git a/bedrock/newsletter/urls.py b/bedrock/newsletter/urls.py
index 437d7cdaf6c..498e9abfc18 100644
--- a/bedrock/newsletter/urls.py
+++ b/bedrock/newsletter/urls.py
@@ -56,4 +56,5 @@
page('newsletter/firefox', 'newsletter/firefox.html'),
page('newsletter/developer', 'newsletter/developer.html'),
page('newsletter/country/success', 'newsletter/country_success.html'),
+ page('newsletter/fxa-error', 'newsletter/fxa-error.html'),
)
diff --git a/bedrock/newsletter/views.py b/bedrock/newsletter/views.py
index d548fb20d12..8227c75df30 100644
--- a/bedrock/newsletter/views.py
+++ b/bedrock/newsletter/views.py
@@ -62,8 +62,6 @@
'title': _lazy(u'About Standards')},
u'addon-dev': {
'title': _lazy(u'Addon Development')},
- u'addons': {
- 'title': _lazy(u'About Addons')},
u'affiliates': {
'description': _lazy(u'A monthly newsletter to keep you up to date with the '
u'Firefox Affiliates program.'),
@@ -74,7 +72,7 @@
u'app-dev': {
'description': _lazy(u'A developer\u2019s guide to highlights of Web platform '
u'innovations, best practices, new documentation and more.'),
- 'title': _lazy(u'Mozilla Developer Newsletter')},
+ 'title': _lazy(u'Developer Newsletter')},
u'aurora': {
'description': _lazy(u'Aurora'),
'title': _lazy(u'Aurora')},
@@ -123,8 +121,15 @@
'title': _lazy(u'Get Firefox for Android')},
u'get-involved': {
'title': _lazy(u'Get Involved')},
+ u'internet-health-report': {
+ 'title': _lazy(u'Internet Health Report'),
+ 'description': _lazy(u'Keep up with our annual compilation of research and stories on the issues of privacy '
+ u'& security, openness, digital inclusion, decentralization, and web literacy.')},
u'join-mozilla': {
'title': _lazy(u'Join Mozilla')},
+ u'knowledge-is-power': {
+ 'description': _lazy(u'Get all the knowledge you need to stay safer and smarter online.'),
+ 'title': _lazy(u'Knowledge is Power')},
u'labs': {
'title': _lazy(u'About Labs')},
u'maker-party': {
@@ -141,17 +146,15 @@
'description': _lazy(u'Keep up with releases and news about Firefox for Android.'),
'title': _lazy(u'Firefox for Android')},
u'mozilla-and-you': {
- 'description': _lazy(u'A monthly newsletter and special announcements giving you tips to '
- u'improve your experience with Firefox on your desktop and Android device.'),
- 'title': _lazy(u'Firefox')},
+ 'description': _lazy(u'Get how-tos, advice and news to make your Firefox experience work best for you.'),
+ 'title': _lazy(u'Firefox News')},
u'mozilla-festival': {
'description': u"Special announcements about Mozilla's annual, hands-on festival "
u"dedicated to forging the future of the open Web.",
'title': _lazy(u'Mozilla Festival')},
u'mozilla-foundation': {
- 'description': _lazy(u'News and special updates about our work to promote openness, innovation '
- u'and participation on the Internet, including ways for you to get involved.'),
- 'title': _lazy(u'Mozilla')},
+ 'description': _lazy(u'Regular updates to keep you informed and active in our fight for a better internet.'),
+ 'title': _lazy(u'Mozilla News')},
u'mozilla-general': {
'description': _lazy(u'Special announcements and messages from the team dedicated to keeping '
u'the Web free and open.'),
@@ -164,6 +167,9 @@
u'mozilla-phone': {
'description': _lazy(u'Email updates for vouched Mozillians on mozillians.org.'),
'title': _lazy(u'Mozillians')},
+ u'mozilla-technology': {
+ 'description': _lazy(u"We're building the technology of the future. Come explore with us."),
+ 'title': _lazy(u'Mozilla Labs')},
u'os': {
'description': _lazy(u'Firefox OS news, tips, launch information and where to buy.'),
'title': _lazy(u'Firefox OS')},
@@ -174,10 +180,17 @@
'description': _lazy(u'Former University program from 2008-2011, now retired and relaunched as '
u'the Firefox Student Ambassadors program.'),
'title': _lazy(u'Student Reps')},
+ u'take-action-for-the-internet': {
+ 'description': _lazy(u'Add your voice to petitions, events and initiatives '
+ u'that fight for the future of the web.'),
+ 'title': _lazy(u'Take Action for the Internet')},
+ u'test-pilot': {
+ 'description': _lazy(u'Help us make a better Firefox for you by test-driving '
+ u'our latest products and features.'),
+ 'title': _lazy(u'New Product Testing')},
u'webmaker': {
'description': _lazy(u'Special announcements helping you get the most out of Webmaker.'),
- 'title': _lazy(u'Webmaker'),
- },
+ 'title': _lazy(u'Webmaker')},
}
@@ -272,7 +285,7 @@ def existing(request, token=None):
can manage their subscriptions without needing an account somewhere with
userid & password.
"""
- locale = getattr(request, 'locale', 'en-US')
+ locale = l10n_utils.get_locale(request)
if not token:
return redirect(reverse('newsletter.recovery'))
@@ -299,10 +312,13 @@ def existing(request, token=None):
# u'email': u'user@example.com'
# }
- user_exists = False
+ has_fxa = 'fxa' in request.GET
+ user = None
if token:
try:
- user = basket.user(token)
+ # ask for fxa status if not passed in the URL
+ params = None if has_fxa else {'fxa': 1}
+ user = basket.request('get', 'user', token=token, params=params)
except basket.BasketNetworkException:
# Something wrong with basket backend, no point in continuing,
# we'd probably fail to subscribe them anyway.
@@ -311,15 +327,15 @@ def existing(request, token=None):
return l10n_utils.render(request, 'newsletter/existing.html')
except basket.BasketException as e:
log.exception("FAILED to get user from token (%s)", e.desc)
- else:
- user_exists = True
- if not user_exists:
+ if not user:
# Bad or no token
messages.add_message(request, messages.ERROR, bad_token)
# Redirect to the recovery page
return redirect(reverse('newsletter.recovery'))
+ # if `has_fxa` not returned from basket, set it from the URL
+ user.setdefault('has_fxa', has_fxa)
# Get the newsletter data - it's a dictionary of dictionaries
newsletter_data = utils.get_newsletters()
@@ -327,20 +343,22 @@ def existing(request, token=None):
# as already subscribed.
initial = []
for newsletter, data in newsletter_data.items():
- # Ignore newsletters in the OTHER_NEWSLETTERS setting
- if newsletter in settings.OTHER_NEWSLETTERS:
- continue
-
# Only show a newsletter if it has ['active'] == True and
# ['show'] == True or the user is already subscribed
if not data.get('active', False):
continue
- if data.get('show', False) or newsletter in user['newsletters']:
+ if (data.get('show', False) or newsletter in user['newsletters'] or
+ (user['has_fxa'] and newsletter in settings.FXA_NEWSLETTERS and
+ any(locale.startswith(l) for l in settings.FXA_NEWSLETTERS_LOCALES))):
langs = data['languages']
nstrings = NEWSLETTER_STRINGS.get(newsletter)
if nstrings:
- title = nstrings['title']
+ if newsletter == 'firefox-accounts-journey' and locale.startswith('en'):
+ # alternate english title
+ title = u'Firefox Account Tips'
+ else:
+ title = nstrings['title']
description = nstrings.get('description', u'')
else:
# Firefox Marketplace for Desktop/Android/Firefox OS should be
@@ -355,6 +373,7 @@ def existing(request, token=None):
'newsletter': newsletter,
'description': Markup(description),
'english_only': len(langs) == 1 and langs[0].startswith('en'),
+ 'indented': data.get('indent', False),
}
if 'order' in data:
form_data['order'] = data['order']
diff --git a/bedrock/redirects/redirects.py b/bedrock/redirects/redirects.py
index 44bcb2f2c9d..61635fb0322 100644
--- a/bedrock/redirects/redirects.py
+++ b/bedrock/redirects/redirects.py
@@ -2079,6 +2079,8 @@
'http://developer.mozilla.org/en/Debugging_Mozilla_on_Linux_FAQ'),
redirect(r'^unix/solaris-build\.html$',
'http://developer.mozilla.org/en/Mozilla_Build_FAQ#Unix-specific_questions'),
+ # bug 1551914
+ redirect(r'^unix/customizing\.html$', 'https://www-archive.mozilla.org/unix/customizing.html'),
redirect(r'^webtools$', 'https://developer.mozilla.org/en/Mozilla_Development_Tools'),
redirect(r'^xmlextras/$', 'http://developer.mozilla.org/en/XML_Extras'),
redirect(r'^xmlextras/xmldataislands/example1\.html$',
diff --git a/bedrock/settings/base.py b/bedrock/settings/base.py
index 946a4c4de62..d54b924e4a0 100644
--- a/bedrock/settings/base.py
+++ b/bedrock/settings/base.py
@@ -693,15 +693,14 @@ def get_app_name(hostname):
# e.g. '//mozorg.cdn.mozilla.net'
CDN_BASE_URL = config('CDN_BASE_URL', default='')
-# Used on the newsletter preference center, included in the "interests" section.
-OTHER_NEWSLETTERS = [
- 'firefox-desktop',
- 'mobile',
- 'os',
- 'firefox-ios',
- 'mozilla-general',
- 'firefox-os',
+# newsletters that always show for FxA holders
+FXA_NEWSLETTERS = [
+ 'firefox-accounts-journey',
+ 'test-pilot',
+ 'take-action-for-the-internet',
+ 'knowledge-is-power',
]
+FXA_NEWSLETTERS_LOCALES = ['en', 'de', 'fr']
# Regional press blogs map to locales
PRESS_BLOG_ROOT = 'https://blog.mozilla.org/'
diff --git a/bin/tag-release.sh b/bin/tag-release.sh
index ea17eb26d49..a7be7e1db02 100755
--- a/bin/tag-release.sh
+++ b/bin/tag-release.sh
@@ -19,10 +19,12 @@ while [[ $# -ge 1 ]]; do
shift # past argument or value
done
-echo "Did you test on stage first? If not, are you sure you want to skip going to stage?"
-read stage
+# prompt for confirmation, evaluate after first letter typed
+read -p "Did you test on stage first? If not, are you sure you want to skip going to stage? (y to continue, n to cancel)" -n 1 stage
+echo # because the user doesn't press enter anymore we have to add a new line here for readability
if [ "$stage" == "${stage#[Yy]}" ]; then
# $stage doesn't start with y or Y
+ echo "Cancelled."
exit
fi
diff --git a/jenkins/branches/frankfurt-prod.yml b/jenkins/branches/frankfurt-prod.yml
index c2916ebff99..b48e72b3d8f 100644
--- a/jenkins/branches/frankfurt-prod.yml
+++ b/jenkins/branches/frankfurt-prod.yml
@@ -4,8 +4,7 @@ push_public_registry: true
regions:
- frankfurt
apps:
- - bedrock-stage
- bedrock-prod
integration_tests:
frankfurt:
- - firefox
+ - headless
diff --git a/media/css/firefox/accounts-2019.scss b/media/css/firefox/accounts-2019.scss
new file mode 100644
index 00000000000..b0d4b4d5134
--- /dev/null
+++ b/media/css/firefox/accounts-2019.scss
@@ -0,0 +1,549 @@
+// 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 '../../protocol/css/includes/lib';
+
+
+.mzp-t-firefox {
+ color: $color-off-black;
+
+ h1, h2, h3, h4 {
+ font-weight: bold;
+ }
+}
+
+.c-section-title {
+ @include text-display-md;
+ max-width: $content-sm;
+ margin: 0 auto $layout-xl;
+ text-align: center;
+}
+
+
+//* -------------------------------------------------------------------------- */
+// Hero
+
+.c-accounts-hero {
+ padding: $spacing-lg 0;
+ text-align: center;
+
+ .c-accounts-hero-title {
+ @include text-display-lg;
+ background: transparent url('/media/img/logos/firefox/logo-master-wordmark-dark.svg') center top no-repeat;
+ @include background-size(150px, 48px);
+ margin-bottom: $spacing-xl;
+ padding-top: (60px + $spacing-2xl);
+
+ span {
+ color: $color-red-50;
+ }
+ }
+
+ .c-accounts-hero-desc {
+ @include text-body-lg;
+ }
+
+ @media #{$mq-md} {
+ background: transparent url('/media/img/firefox/accounts/trailhead/accounts-hero-logged-out.svg') right -720px top no-repeat;
+ @include background-size(1660px 275px);
+
+ .state-fxa-supported-signed-in & {
+ @include background-size(2188px 275px);
+ background-image: url('/media/img/firefox/accounts/trailhead/accounts-hero-logged-in.svg');
+ background-position: right -960px top -40px;
+ }
+ }
+
+ @media #{$mq-lg} {
+ @include background-size(3441px 570px);
+ @include bidi(((text-align, left, right),));
+ background-position: center top;
+ min-height: 560px;
+
+ .state-fxa-supported-signed-in & {
+ @include background-size(3500px 440px);
+ background-position: center top;
+ min-height: 420px;
+ }
+
+ .c-accounts-hero-body {
+ @include grid-half;
+ @include bidi(((float, left, right),));
+ }
+
+ .c-accounts-hero-title {
+ @include bidi(((background-position, left top, right top),));
+ }
+
+ @supports (display: grid) {
+ & > .mzp-l-content {
+ display: grid;
+ grid-template-columns: repeat(2, 1fr);
+ grid-column-gap: $spacing-2xl;
+ }
+
+ .c-accounts-hero-body {
+ float: none;
+ width: auto;
+ }
+ }
+ }
+}
+
+
+
+//* -------------------------------------------------------------------------- */
+// FxA signup form
+
+.c-accounts-form {
+ background: $color-white;
+ border-radius: 6px;
+ box-shadow: 0 0 16px 0 rgba(0, 0, 0, .15);
+ margin: $layout-lg auto 0;
+ max-width: 330px;
+ padding: $spacing-lg;
+ text-align: center;
+
+ .fxa-email-form-title {
+ @include text-display-sm;
+ }
+
+ .state-fxa-supported-signed-in & {
+ display: none;
+ }
+
+ .mzp-c-button {
+ width: 100%;
+ }
+
+ .fxa-signin {
+ @include text-body-sm;
+ margin-top: $spacing-lg;
+ }
+
+ @media #{$mq-lg} {
+ @include bidi(((float, right, left),));
+ margin-top: (60px + $spacing-2xl);
+
+ @supports (display: grid) {
+ float: none;
+ }
+ }
+}
+
+
+//* -------------------------------------------------------------------------- */
+// Products
+
+.c-product-list {
+ max-width: $content-md;
+ margin: $spacing-2xl auto;
+
+ @media #{$mq-sm} {
+ @supports (display: grid) {
+ display: grid;
+ grid-template-columns: repeat(2, 1fr);
+ grid-gap: $layout-md $layout-lg;
+ }
+ }
+}
+
+.c-product-list-item {
+ margin: 0 auto $layout-lg;
+ text-align: center;
+ max-width: $content-xs;
+
+ a:link,
+ a:visited {
+ display: block;
+ text-decoration: none;
+
+ .c-product-list-title {
+ color: $color-off-black;
+ }
+
+ .c-product-list-desc {
+ text-decoration: underline;
+ }
+
+ &:hover,
+ &:focus,
+ &:active {
+ .c-product-list-desc {
+ text-decoration: none;
+ }
+ }
+ }
+
+ @media #{$mq-sm} {
+ @include bidi(((text-align, left, right),));
+
+ @supports (display: grid) {
+ margin: 0;
+ }
+ }
+}
+
+.c-product-list-title {
+ @include background-size(50px, 50px);
+ @include bidi((
+ (background-position, left top, right top),
+ (padding-left, $layout-lg, 0),
+ (padding-right, 0, $layout-lg),
+ (text-align, left, right),
+ ));
+ @include text-display-sm;
+ background-repeat: no-repeat;
+ margin: 0 auto $spacing-lg;
+ min-height: 50px;
+ width: 100px;
+
+ span {
+ display: block;
+ font-weight: normal;
+ }
+
+ .t-product-firefox & {
+ background-image: url('/media/img/logos/firefox/logo-quantum.png');
+ }
+
+ .t-product-lockwise & {
+ background-image: url('/media/img/logos/firefox/logo-lockwise.svg');
+ }
+
+ .t-product-monitor & {
+ background-image: url('/media/img/logos/firefox/logo-monitor.svg');
+ }
+
+ .t-product-send & {
+ background-image: url('/media/img/logos/firefox/logo-send.svg');
+ }
+
+ @media #{$mq-sm} {
+ margin: 0 0 $spacing-lg;
+ }
+}
+
+.c-product-list-desc {
+ @include text-body-lg;
+}
+
+.c-accounts-products-tagline {
+ @include font-size(32px);
+ font-weight: bold;
+ color: $color-red-50;
+ max-width: $content-md;
+ margin: $layout-lg auto;
+ text-align: center;
+}
+
+
+//* -------------------------------------------------------------------------- */
+// Value propositions
+
+.c-accounts-value {
+ @include text-body-lg;
+ margin-bottom: $layout-lg;
+
+ .c-accounts-value-container {
+ overflow: hidden;
+ }
+
+ .c-accounts-value-content {
+ @include border-box;
+ min-width: $content-xs;
+ padding: $layout-xs;
+ }
+
+ .c-accounts-value-media {
+ @include clearfix;
+ margin-bottom: $spacing-xl;
+ padding: $layout-xs;
+ max-width: 800px;
+ }
+
+ &.l-media-left .c-accounts-value-media {
+ @include bidi((
+ (margin-left, -25%, auto),
+ (margin-right, auto, -25%),
+ ));
+
+ img {
+ @include bidi((
+ (float, left, right),
+ (margin-left, -10%, auto),
+ (margin-right, auto, -10%),
+ (transform, none, scaleX(-1)),
+ ));
+ }
+ }
+
+ &.l-media-right .c-accounts-value-media {
+ @include bidi((
+ (margin-left, auto, -25%),
+ (margin-right, -25%, auto),
+ ));
+
+ img {
+ @include bidi((
+ (float, right, left),
+ (margin-left, auto, -10%),
+ (margin-right, -10%, auto),
+ (transform, none, scaleX(-1)),
+ ));
+ }
+ }
+
+ @media #{$mq-sm} {
+ &.l-media-left .c-accounts-value-media,
+ &.l-media-right .c-accounts-value-media {
+ margin-left: 0;
+ margin-right: 0;
+ }
+ }
+
+ @media #{$mq-md} {
+ .c-accounts-value-container {
+ margin: 0 auto;
+ max-width: $content-md;
+ padding: 0 $layout-xl;
+ }
+
+ @supports (display: grid) {
+ .c-accounts-value-container {
+ align-items: center;
+ display: grid;
+ grid-column-gap: $layout-lg;
+ grid-template-columns: repeat(2, 1fr);
+ margin: 0;
+ max-width: none;
+ padding: 0;
+ }
+
+ .c-accounts-value-media {
+ grid-row: 1;
+ padding: 0;
+
+ img {
+ float: none;
+ width: 800px;
+ }
+ }
+
+ .c-accounts-value-content {
+ grid-row: 1;
+ max-width: ($content-max / 2) - $spacing-lg;
+ padding: 0;
+ }
+
+ &.l-media-left {
+ .c-accounts-value-content {
+ @include bidi((
+ (padding-left, 0, $layout-lg),
+ (padding-right, $layout-lg, 0),
+ ));
+ grid-column: 2;
+ }
+
+ .c-accounts-value-media {
+ @include bidi((
+ (margin-left, -25%, 0),
+ (margin-right, 0, -25%),
+ ));
+ grid-column: 1;
+ justify-self: end;
+
+ img {
+ @include bidi((
+ (float, right, left),
+ (transform, none, scaleX(-1)),
+ ));
+ }
+ }
+ }
+
+ &.l-media-right {
+ .c-accounts-value-content {
+ @include bidi((
+ (padding-right, 0, $layout-lg),
+ (padding-left, $layout-lg, 0),
+ ));
+ grid-column: 1;
+ justify-self: end;
+ }
+
+ .c-accounts-value-media {
+ @include bidi((
+ (margin-left, 0, -25%),
+ (margin-right, -25%, 0),
+ ));
+ grid-column: 2;
+ justify-self: start;
+
+ img {
+ @include bidi((
+ (float, left, right),
+ (transform, none, scaleX(-1)),
+ ));
+ }
+ }
+ }
+ }
+
+ @media #{$mq-lg} {
+ &.l-media-left .c-accounts-value-content {
+ @include bidi((
+ (padding-left, 0, $layout-xl),
+ (padding-right, $layout-xl, 0),
+ ));
+ }
+
+ &.l-media-right .c-accounts-value-content {
+ @include bidi((
+ (padding-right, 0, $layout-xl),
+ (padding-left, $layout-xl, 0),
+ ));
+ }
+ }
+ }
+}
+
+.c-accounts-value-title {
+ @include text-display-md;
+}
+
+
+//* -------------------------------------------------------------------------- */
+// Join the movement
+
+.c-accounts-movement .c-section-title {
+ @include font-size(32px);
+ font-weight: bold;
+ color: $color-red-50;
+ max-width: $content-md;
+ margin: 0 auto $layout-lg;
+ text-align: center;
+}
+
+.c-accounts-movement-container {
+ margin: $layout-xl auto;
+
+ @media #{$mq-md} {
+ @supports (display: grid) {
+ display: grid;
+ grid-template-columns: repeat(2, 1fr);
+ grid-template-rows: 2;
+ grid-column-gap: $layout-lg;
+ }
+ }
+}
+
+.c-accounts-movement-item {
+ @include background-size(50px, 50px);
+ @include border-box;
+ background-position: center top;
+ background-repeat: no-repeat;
+ margin: 0 auto $layout-lg;
+ max-width: $content-sm;
+ padding-top: $layout-lg + 10px;
+ text-align: center;
+
+ &.t-movement-build {
+ background-image: url('/media/img/firefox/accounts/trailhead/icon-experiments.svg');
+ }
+
+ &.t-movement-bigtech {
+ background-image: url('/media/img/firefox/accounts/trailhead/icon-inbox.svg');
+ }
+
+ @media #{$mq-md} {
+ @include bidi((
+ (background-position, left $spacing-sm, right $spacing-sm),
+ (padding-left, $layout-lg + 10px, 0),
+ (padding-right, 0, $layout-lg + 10px),
+ (text-align, left, right),
+ ));
+ padding-top: 0;
+
+ @supports (display: grid) {
+ max-width: none;
+ margin: 0;
+ }
+ }
+}
+
+.c-accounts-movement-title {
+ @include text-display-md;
+}
+
+.c-accounts-movement-desc {
+ @include text-body-lg;
+}
+
+
+//* -------------------------------------------------------------------------- */
+// Flip backgrounds for right-to-left languages
+
+[dir='rtl'] {
+ .c-accounts-hero {
+ background-image: none;
+ overflow-x: hidden;
+ position: relative;
+
+ & > .mzp-l-content {
+ z-index: 2;
+ }
+
+
+ @media #{$mq-md} {
+ &:after {
+ @include background-size(1660px 275px);
+ background-image: url('/media/img/firefox/accounts/trailhead/accounts-hero-logged-out.svg');
+ background-position: center top;
+ background-repeat: no-repeat;
+ content: '';
+ display: block;
+ height: 275px;
+ left: 10%;
+ margin-left: -830px;
+ position: absolute;
+ top: 0;
+ transform: scaleX(-1);
+ width: 1660px;
+ z-index: 1;
+ }
+ }
+
+ @media #{$mq-lg} {
+ &:after {
+ @include background-size(3441px 570px);
+ height: 570px;
+ left: 50%;
+ margin-left: -1720px;
+ width: 3441px;
+ }
+ }
+ }
+
+ @media #{$mq-md} {
+ .state-fxa-supported-signed-in .c-accounts-hero:after {
+ @include background-size(2188px 275px);
+ background-image: url('/media/img/firefox/accounts/trailhead/accounts-hero-logged-in.svg');
+ height: 275px;
+ margin-left: -1094px;
+ width: 2188px;
+ }
+ }
+
+ @media #{$mq-lg} {
+ .state-fxa-supported-signed-in .c-accounts-hero:after {
+ @include background-size(3500px 440px);
+ height: 440px;
+ margin-left: -1750px;
+ width: 3500px;
+ }
+ }
+}
+
diff --git a/media/css/firefox/fights-for-you.scss b/media/css/firefox/fights-for-you.scss
index d8f392e0712..88ec0c31d07 100644
--- a/media/css/firefox/fights-for-you.scss
+++ b/media/css/firefox/fights-for-you.scss
@@ -32,8 +32,8 @@ $image-path: '/media/protocol/img';
#fights-for-you .mzp-t-firefox h2,
#fights-for-you .mzp-t-firefox h3,
#fights-for-you .mzp-t-firefox h4 {
- font-family: sharpsans, sans-serif;
- font-weight: normal;
+ font-family: 'Sharp Sans', sans-serif;
+ font-weight: bold;
}
$fffy-purple: #2A0140; // do not update to match new colour tokens without updating background image assets
diff --git a/media/css/firefox/home/pre-download-newsletter-protocol.scss b/media/css/firefox/home/pre-download-newsletter-protocol.scss
deleted file mode 100644
index 9d19fe1702a..00000000000
--- a/media/css/firefox/home/pre-download-newsletter-protocol.scss
+++ /dev/null
@@ -1,110 +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 '../../../protocol/css/includes/lib';
-@import '../../../protocol/css/components/newsletter-form';
-
-
-// Compact modal
-.mzp-c-modal.l-compact {
-
- header {
- display: none;
- }
-
- .mzp-c-modal-inner {
- @media #{$mq-md} {
- max-width: 530px;
- margin: 0 auto;
- }
-
- .mzp-c-modal-overlay-contents {
- padding: $spacing-lg;
- }
- }
-}
-
-
-.pre-download-newsletter {
- background: $color-white;
- color: $color-black;
-
- h2 {
- @include font-size(28px);
- font-weight: bold;
- margin-bottom: 20px;
- }
-
- input[type='email'] {
- @include border-box;
- @include text-body-md;
- border-radius: 2px;
- padding: ($spacing-md - 2px) ($spacing-xl - 2px); //2px extra padding removed to compensate for 2px border.
- width: 100%;
- }
-
- a:link,
- a:visited {
- color: $color-link;
- text-decoration: underline;
- }
-
- a:hover,
- a:active,
- a:focus {
- text-decoration: none;
- }
-
- &.mzp-c-newsletter {
- display: block;
- padding: $layout-sm;
- }
-
- .mzp-c-fieldnote {
- display: none;
- }
-
- .mzp-c-newsletter-form,
- .mzp-c-newsletter-thanks {
- padding-top: 0;
- }
-
- .mzp-c-button {
- text-align: center;
- }
-
- .mzp-c-form-submit {
- margin-bottom: 0;
- }
-
- .pre-download-privacy {
- @include text-body-md;
- text-align: center;
- }
-
- .pre-download-continue {
- margin-top: $layout-lg;
-
- .mzp-c-button {
- &:link,
- &:visited {
- border: 2px solid $color-link;
- background: $color-white;
- color: $color-link;
- text-decoration: none;
- }
-
- &:hover,
- &:active,
- &:focus {
- background: $color-link-hover;
- border-color: $color-link-hover;
- color: $color-white;
- }
- }
- }
-}
diff --git a/media/css/firefox/home/protocol.scss b/media/css/firefox/home/protocol.scss
index 551dfc2f5b0..0e086e9de5f 100644
--- a/media/css/firefox/home/protocol.scss
+++ b/media/css/firefox/home/protocol.scss
@@ -5,8 +5,7 @@
$font-path: '/media/fonts';
$image-path: '/media/protocol/img';
-@import '../../libs/system-font';
-
+@import '../../hubs/sub-nav-protocol';
@import '../../../protocol/css/includes/lib';
@import '../../../protocol/css/components/feature-card';
@import '../../../protocol/css/components/hero';
@@ -17,16 +16,6 @@ $image-path: '/media/protocol/img';
//* -------------------------------------------------------------------------- */
// Page specific variables and over-rides
-.mzp-t-firefox {
- &,
- h1,
- h2,
- h3,
- h4 {
- font-family: system-ui, sans-serif;
- }
-}
-
main .mzp-l-content {
max-width: 400px;
@@ -40,12 +29,11 @@ main .mzp-l-content {
.mzp-c-hero {
text-align: center;
- color: $color-purple-90;
}
.mzp-c-hero-title {
@include text-display-sm;
- font-weight: bold;
+ font-weight: normal;
padding-top: 0;
&:before {
@@ -59,17 +47,12 @@ main .mzp-l-content {
vertical-align: middle;
width: 48px;
}
-
- strong {
- font-weight: normal;
- }
}
.mzp-c-hero-desc {
- @include text-display-xl;
+ @include text-display-xxl;
font-weight: bold;
- margin-bottom: $spacing-md;
- color: $color-purple-90;
+ margin-bottom: $layout-md;
p {
margin-bottom: $spacing-lg;
@@ -82,13 +65,20 @@ main .mzp-l-content {
@media #{$mq-md} {
.mzp-c-hero.mzp-has-image {
- @include at2x('/media/img/firefox/home/hero-small.jpg', contain);
+ @include at2x('/media/img/firefox/home/hero-small.jpg', 1640px);
align-items: center;
- background-position: top left 50vw;
+ background-position: top center;
background-repeat: no-repeat;
display: flex;
- min-height: 560px;
+ min-height: 610px;
text-align: left;
+ box-sizing: border-box;
+
+ .test-var-e & {
+ background-image: url('/media/img/firefox/home/var-e-product.svg'), url('/media/img/firefox/home/var-e-bg.svg');
+ background-position: left calc(50% + 348px) top 72px, top -110px left 48vw;
+ background-size: 593px auto, 1055px auto;
+ }
}
.mzp-l-content {
@@ -96,14 +86,6 @@ main .mzp-l-content {
}
}
-@media #{$mq-lg} and #{$mq-tall} {
- .mzp-c-hero.mzp-has-image {
- @include at2x('/media/img/firefox/home/hero.jpg', contain);
- height: 60vh;
- max-height: 672px;
- }
-}
-
//* -------------------------------------------------------------------------- */
// Feature cards
@@ -114,14 +96,6 @@ main .mzp-l-content {
min-width: 0; // because of https://stackoverflow.com/questions/43311943/prevent-content-from-expanding-grid-items
}
- .mzp-c-card-feature-title {
- color: $color-purple-90;
- }
-
- .mzp-c-card-feature-desc {
- color: $color-gray-80;
- }
-
@media #{$mq-lg} {
.mzp-c-card-feature-title {
@include text-display-lg;
@@ -134,18 +108,15 @@ main .mzp-l-content {
// Trio
.c-trio {
- color: $color-gray-80;
h2 {
@include text-display-lg;
- color: $color-purple-90;
margin-top: $layout-lg;
text-align: center;
}
h3 {
@include text-display-sm;
- color: $color-purple-90;
}
ul {
@@ -292,8 +263,7 @@ main .mzp-l-content {
}
@media #{$mq-lg} {
- // do not update background colour without updating background image
- background: #20123a top left calc(50% + 500px) no-repeat url('/media/img/firefox/home/bright.png');
+ background: $color-off-black;
padding-top: $layout-sm;
.mzp-l-content {
diff --git a/media/css/firefox/whatsnew/whatsnew-67.0.5.scss b/media/css/firefox/whatsnew/whatsnew-67.0.5.scss
new file mode 100644
index 00000000000..973fe26564b
--- /dev/null
+++ b/media/css/firefox/whatsnew/whatsnew-67.0.5.scss
@@ -0,0 +1,208 @@
+// 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 '../../../protocol/css/includes/lib';
+@import '../../../protocol/css/components/hero';
+@import '../../protocol/components/state-fxa';
+
+body {
+ background: $color-white url('/media/img/firefox/whatsnew_67/noodles.png') no-repeat;
+ background-size: 850px;
+ background-position-x: -350px;
+ background-position-y: $layout-md;
+}
+
+main {
+ color: $color-off-black;
+}
+
+//* -------------------------------------------------------------------------- */
+// Up-to-date page header
+
+.c-page-header {
+ background: #fff;
+ margin-bottom: $spacing-2xl;
+ margin-left: 0;
+}
+
+.c-page-header-up-to-date {
+ @include text-display-xxs;
+ display: none;
+ margin-top: $layout-xs;
+
+ span {
+ background-color: #6EE7C4;
+ border-radius: 2px;
+ display: inline-block;
+ font-weight: normal;
+ padding: $spacing-sm $spacing-md;
+ max-width: $content-sm;
+ }
+
+ .is-up-to-date & {
+ display: block;
+ }
+}
+
+@media #{$mq-md} {
+ .c-page-header-inner {
+ align-items: center;
+ display: grid;
+ grid-template-columns: 1fr max-content 1fr;
+ }
+
+ .c-page-header-up-to-date {
+ margin: 0 $layout-sm;
+ }
+}
+
+//* -------------------------------------------------------------------------- */
+// CTA
+
+.card {
+ background: #fff;
+ border-radius: 3px;
+ box-shadow: 1px 1px 10px 1px rgba(0, 0, 0, 0.21);
+ padding: $spacing-xl $spacing-2xl;
+ margin: 0 auto;
+ max-width: 600px;
+
+ h1 {
+ font-size: 2.25rem;
+ margin-bottom: 1em;
+ }
+
+ .show-fxa-supported-signed-in {
+ #monitor-logo {
+ float: left;
+ }
+
+ .mzp-l-hero-content {
+ margin-left: $layout-xl;
+ }
+ }
+
+ h2 {
+ @include text-display-sm;
+ }
+}
+
+//* -------------------------------------------------------------------------- */
+// Benefits
+
+.c-benefits {
+ @media #{$mq-lg} {
+ width: $content-md;
+ }
+
+ .benefits-list {
+ .respect-glyphs {
+ display: flex;
+ flex-direction: column;
+ float: left;
+ margin-bottom: 0;
+
+ img {
+ align-self: center;
+ margin-bottom: 20px;
+ }
+ }
+
+ h2 {
+ @include text-display-sm;
+ margin-bottom: $layout-lg;
+ }
+
+ hr {
+ border-top-width: 2px;
+ clear:left;
+ }
+
+ .benefit-content {
+ padding-left: $layout-xl;
+
+ h3 {
+ @include text-display-xs;
+ }
+ }
+
+ div {
+ margin-bottom: $layout-md;
+ }
+
+ .glyphs {
+ float: left;
+ width: 40px;
+ }
+ }
+}
+
+//* -------------------------------------------------------------------------- */
+// FxA Form
+
+.c-signup-container {
+ display: flex;
+ flex-direction: row;
+}
+
+.fxa-form-cta {
+ .fxa-email-form {
+ width: 100%;
+ margin-bottom: $spacing-lg;
+
+ a {
+ color: $color-off-black;
+ }
+ }
+
+ .fxa-email-form-intro {
+ display: none;
+ }
+
+ .fxa-email-field-container {
+ .field {
+ label {
+ @include visually-hidden;
+ }
+
+ input[type="email"] {
+ box-shadow: none;
+ padding: 12px 16px;
+ width: 100%;
+ }
+ }
+
+ .mzp-c-button {
+ width: 100%;
+ }
+ }
+
+ @media #{$mq-sm} {
+ .fxa-email-field-container {
+ @include grid-column-gap($spacing-md);
+ display: grid;
+ grid-template-columns: 2fr 1fr;
+
+ .field {
+ margin-bottom: 0;
+ }
+ }
+ }
+
+ @media #{$mq-md} {
+ .fxa-email-form {
+ display: grid;
+
+ .agreement {
+ @include text-body-sm;
+ grid-row-start: 2;
+ margin-top: $spacing-sm;
+ margin-bottom: 0;
+ }
+ }
+ }
+}
diff --git a/media/css/hubs/_sub-nav-download-button-remove-protocol.scss b/media/css/hubs/_sub-nav-download-button-remove-protocol.scss
new file mode 100644
index 00000000000..0762daa936f
--- /dev/null
+++ b/media/css/hubs/_sub-nav-download-button-remove-protocol.scss
@@ -0,0 +1,13 @@
+// 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/.
+
+// Bug 1429849 - Override to hide the download button in sub navigation menu.
+
+#sub-nav-download-firefox {
+ display: none;
+}
+
+.moz-sub-nav .sub-nav-primary-links-container {
+ width: 100%;
+}
diff --git a/media/css/hubs/_sub-nav-protocol.scss b/media/css/hubs/_sub-nav-protocol.scss
new file mode 100644
index 00000000000..13602eeb23a
--- /dev/null
+++ b/media/css/hubs/_sub-nav-protocol.scss
@@ -0,0 +1,298 @@
+// 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 '../../protocol/css/includes/lib';
+
+.moz-sub-nav {
+ @include clearfix();
+ @include open-sans;
+ background: #fff;
+ display: none; // hidden for mobile
+ min-height: 52px;
+ overflow: hidden;
+
+ .sub-nav-primary-links {
+ a:link,
+ a:visited {
+ color: #000;
+ text-decoration: none;
+ }
+
+ a:hover,
+ a:focus,
+ a:active {
+ color: #000;
+ text-decoration: underline;
+ transition: color 0.1s ease-in-out;
+ }
+ }
+
+ .nav-horizontal-menu {
+ @include clearfix;
+ border-top: 2px solid #000;
+ margin: 0 60px;
+ position: relative;
+
+ @media #{$mq-lg} {
+ margin: 0 85px;
+ }
+ }
+
+ .nav-horizontal-menu-container {
+ max-width: $content-max;
+ margin: 0 auto;
+ }
+
+ .sub-nav-primary-links-container {
+ float: left;
+ width: calc(100% - 200px);
+ }
+
+ .sub-nav-primary-links {
+ @include font-size(16px);
+ list-style-type: none;
+ margin: 0;
+ padding: 13px 0 0;
+
+ &> li {
+ display: inline-block;
+ padding: 0 20px 10px 0;
+
+ a:hover,
+ a:active,
+ a:focus {
+ text-decoration: none;
+ }
+
+ a:focus {
+ outline: none;
+ }
+
+ &:last-child {
+ padding-right: 0;
+ }
+ }
+ }
+
+ @media #{$mq-md} {
+ display: block;
+ margin-bottom: 20px;
+
+ .sub-nav-logo-link + .sub-nav-primary-links {
+ margin-left: 45px;
+ }
+
+ &.stuck {
+ box-shadow: 0 2px 2px rgba(0, 0, 0, 0.4);
+ position: fixed;
+ top: 0;
+ transform: translateY(-4px);
+ width: 100%;
+ z-index: 200;
+
+ .sub-nav-download-wrapper {
+ height: auto;
+ width: 200px;
+ }
+ }
+ }
+
+ @media #{$mq-lg} {
+ .sub-nav-primary-links {
+ li {
+ padding: 0 20px 10px 0;
+
+ &:last-child {
+ padding-right: 0;
+ }
+ }
+ }
+
+ .sub-nav-logo-link + .sub-nav-primary-links {
+ margin-left: 98px;
+ }
+ }
+
+ @media #{$mq-xl} {
+ .sub-nav-primary-links li {
+ padding-right: 40px;
+ }
+
+ .sub-nav-logo-link + .sub-nav-primary-links {
+ margin-left: 118px;
+ }
+ }
+
+ // black outline firefox logo
+ .sub-nav-logo-link {
+ display: block;
+ position: absolute;
+ top: 2px;
+ left: 0;
+ height: 26px;
+ padding-top: 10px;
+ width: 26px;
+
+ .sub-nav-logo-path {
+ transition: fill 0.1s ease-in-out;
+ }
+ }
+
+ .sub-nav-download-wrapper {
+ float: right;
+ text-align: right;
+ overflow: hidden;
+ width: 0;
+ height: 0;
+ }
+}
+
+// A mixin to apply theme colors to specific elements
+@mixin theme-color($theme-name, $theme-color) {
+ .moz-sub-nav.#{$theme-name} {
+ .sub-nav-primary-links > li {
+ a:hover,
+ a:active,
+ a:focus {
+ color: $theme-color;
+ }
+
+ a.current {
+ color: $theme-color;
+
+ &:hover {
+ cursor: default;
+ }
+ }
+ }
+
+ .sub-nav-logo-link {
+ &:hover,
+ a:active,
+ &:focus {
+ .sub-nav-logo-path {
+ fill: $theme-color;
+ }
+ }
+ }
+ }
+}
+
+@include theme-color('firefox', $color-orange-70);
+@include theme-color('internet-health', $color-green-70);
+@include theme-color('technology', $color-purple-70);
+
+
+/* -------------------------------------------------------------------------- */
+// Customized Firefox download button for sub navigation.
+// Near-total copy pasta from global-nav.html. TODO: DRY this up
+
+#sub-nav-download-firefox {
+ margin: 7px 0 0;
+ opacity: 0;
+ transform: translateY(-100px);
+ transition: opacity 0.3s ease 0.1s, transform 0.4s ease-in-out;
+ visibility: hidden;
+
+ .download-list {
+ margin: 0;
+
+ &> li {
+ margin: 0;
+ }
+ }
+
+ .download-link:link,
+ .download-link:visited {
+ @include font-size(12px);
+ border-radius: 2px;
+ display: inline-block;
+ font-weight: bold;
+ padding: .5em 20px;
+ text-decoration: none;
+ transition: color .1s ease-in-out, background-color .1s ease-in-out;
+
+ .download-title {
+ font-weight: bold;
+ }
+
+ &:hover,
+ &:focus,
+ &:active {
+ transition: color .1s ease-in-out, background-color .1s ease-in-out;
+ }
+ }
+
+ .fx-privacy-link {
+ display: none;
+ }
+}
+
+@media #{$mq-md} {
+ .moz-sub-nav.stuck #sub-nav-download-firefox {
+ opacity: 1;
+ transform: translateY(0);
+ visibility: visible;
+ }
+
+ .other .moz-sub-nav.stuck #sub-nav-download-firefox,
+ .oldwin .moz-sub-nav.stuck #sub-nav-download-firefox,
+ .oldmac .moz-sub-nav.stuck #sub-nav-download-firefox {
+ display: none;
+ }
+}
+
+html[dir="rtl"] {
+ .sub-nav-primary-links-container {
+ float: right;
+ }
+
+ .sub-nav-primary-links > li {
+ padding: 0 0 10px 20px;
+
+ &:last-child {
+ padding-left: 0;
+ }
+ }
+
+ @media #{$mq-md} {
+ .sub-nav-logo-link + .sub-nav-primary-links {
+ margin-left: 0;
+ margin-right: 45px;
+ }
+ }
+
+ @media #{$mq-lg} {
+ .sub-nav-logo-link + .sub-nav-primary-links {
+ margin-left: 0;
+ margin-right: 98px;
+ }
+ }
+
+ @media #{$mq-xl} {
+ .sub-nav-primary-links li {
+ padding-left: 40px;
+ padding-right: 0;
+ }
+
+ .sub-nav-logo-link + .sub-nav-primary-links {
+ margin-left: 0;
+ margin-right: 120px;
+ }
+ }
+
+ // black outline firefox logo
+ .sub-nav-logo-link {
+ left: auto;
+ right: 0;
+ }
+
+ .sub-nav-download-wrapper {
+ float: left;
+ text-align: left;
+ }
+}
diff --git a/media/css/mozorg/perf-exp/index.scss b/media/css/mozorg/perf-exp/index.scss
new file mode 100644
index 00000000000..8a6100e6f73
--- /dev/null
+++ b/media/css/mozorg/perf-exp/index.scss
@@ -0,0 +1,140 @@
+// 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 '../../../protocol/css/includes/lib';
+
+/* stylelint-disable declaration-no-important */
+
+.backgrounds-invisible {
+ .mzp-c-hero.t-mission {
+ background-image: none !important;
+ }
+}
+
+.ui-invisible {
+ .mzp-c-navigation-download,
+ .mzp-c-navigation-menu-button {
+ display: none !important;
+ }
+
+ .mzp-c-hero.t-mission {
+ .mzp-c-hero-cta .mzp-c-button {
+ display: none !important;
+ }
+ }
+
+ #newsletter-submit,
+ .mzp-c-newsletter-content {
+ display: none !important;
+ }
+}
+
+.text-invisible {
+ .mzp-c-menu-category-list .mzp-c-menu-title,
+ .mzp-c-navigation-download .mzp-c-button {
+ color: transparent !important;
+ }
+
+ .c-page-title {
+ color: transparent !important;
+ }
+
+ .mzp-c-hero.t-mission {
+ color: transparent !important;
+
+ .mzp-c-hero-desc,
+ .mzp-c-hero-cta .mzp-c-button {
+ color: transparent !important;
+ }
+ }
+
+ #outer-wrapper {
+ .mzp-c-card {
+ .mzp-c-card-title,
+ .mzp-c-card-desc,
+ .mzp-c-card-cta .mzp-c-card-cta-text {
+ color: transparent !important;
+ }
+ }
+ }
+
+ .t-global {
+ .mzp-c-hero-title,
+ .mzp-c-hero-desc,
+ .mzp-c-hero-desc a {
+ color: transparent !important;
+ }
+ }
+
+ .c-city-title,
+ .c-city-desc {
+ color: transparent !important;
+ }
+
+ .mzp-c-card-feature {
+ .mzp-c-card-feature-title,
+ .mzp-c-card-feature-desc,
+ .mzp-c-cta-link {
+ color: transparent !important;
+ }
+ }
+
+ .mzp-c-billboard {
+ .mzp-c-billboard-title,
+ .mzp-c-billboard-desc,
+ .mzp-c-cta-link {
+ color: transparent !important;
+ }
+ }
+
+ .mzp-c-newsletter-header,
+ .mzp-c-newsletter-content,
+ #newsletter-submit,
+ .mzp-c-fieldnote {
+ color: transparent !important;
+ }
+
+ #colophon {
+ .mzp-c-footer-section,
+ .mzp-c-footer-list li a,
+ .mzp-c-footer-license,
+ .mzp-c-footer-license a,
+ .mzp-c-footer-terms a,
+ .mzp-c-language-switcher-link {
+ color: transparent !important;
+ }
+ }
+}
+
+.images-invisible {
+ .mzp-c-card-feature .mzp-c-card-feature-media,
+ .mzp-c-billboard .mzp-c-billboard-image-container,
+ .mzp-c-newsletter .mzp-c-newsletter-image {
+ visibility: hidden !important;
+ }
+
+ .c-city:before {
+ background-image: none !important;
+ }
+}
+
+.fonts-delayed {
+ .mzp-c-hero-title,
+ .mzp-c-hero-desc,
+ .c-page-title,
+ .mzp-c-card-title,
+ .mzp-c-card-feature-title,
+ .mzp-c-billboard-title,
+ .c-city-desc strong,
+ .mzp-c-newsletter-title,
+ #read-mission-button,
+ .mzp-c-navigation-download {
+ font-family: X-LocaleSpecific, sans-serif !important;
+ }
+}
+
+/* stylelint-enable declaration-no-important */
diff --git a/media/css/newsletter/newsletter.less b/media/css/newsletter/newsletter.less
index 28469e4b525..d2cfb13debc 100644
--- a/media/css/newsletter/newsletter.less
+++ b/media/css/newsletter/newsletter.less
@@ -25,6 +25,13 @@
.open-sans-light;
.font-size(@largeFontSize);
}
+ p {
+ .open-sans-light;
+ &.disclaimer {
+ .font-size(@smallFontSize);
+ margin-top: 1em;
+ }
+ }
.field-contents {
label {
float: none;
@@ -133,6 +140,12 @@
&.subcategory {
white-space: nowrap;
}
+ &.indented {
+ padding-left: 2em;
+ h4 {
+ .font-size(@largeFontSize);
+ }
+ }
}
td {
padding-right: 0;
diff --git a/media/css/protocol/base/fonts/sharpsans.scss b/media/css/protocol/base/fonts/sharpsans.scss
index f549bb85124..f5dc5cb547f 100644
--- a/media/css/protocol/base/fonts/sharpsans.scss
+++ b/media/css/protocol/base/fonts/sharpsans.scss
@@ -4,10 +4,20 @@
// Global brand fonts will be managed upstream in Protocol.
@font-face {
- font-family: sharpsans;
+ font-family: 'Sharp Sans';
font-weight: normal;
font-style: normal;
font-display: swap;
- src: url('https://assets.mozilla.net/fonts/SharpSans-Bold.woff2') format('woff2'),
- url('https://assets.mozilla.net/fonts/SharpSans-Bold.woff') format('woff');
+ src: url('https://assets.mozilla.net/fonts/FirefoxSharpSans-Medium.woff2') format('woff2'),
+ url('https://assets.mozilla.net/fonts/FirefoxSharpSans-Medium.woff') format('woff');
+}
+
+
+@font-face {
+ font-family: 'Sharp Sans';
+ font-weight: bold;
+ font-style: normal;
+ font-display: swap;
+ src: url('https://assets.mozilla.net/fonts/FirefoxSharpSans-Bold.woff2') format('woff2'),
+ url('https://assets.mozilla.net/fonts/FirefoxSharpSans-Bold.woff') format('woff');
}
diff --git a/media/img/firefox/accounts/trailhead/accounts-hero-logged-in.svg b/media/img/firefox/accounts/trailhead/accounts-hero-logged-in.svg
new file mode 100644
index 00000000000..7203cc86599
--- /dev/null
+++ b/media/img/firefox/accounts/trailhead/accounts-hero-logged-in.svg
@@ -0,0 +1,20 @@
+
+
+
+
+
+
+
+
diff --git a/media/img/firefox/accounts/trailhead/accounts-hero-logged-out.svg b/media/img/firefox/accounts/trailhead/accounts-hero-logged-out.svg
new file mode 100644
index 00000000000..e94d08f57bd
--- /dev/null
+++ b/media/img/firefox/accounts/trailhead/accounts-hero-logged-out.svg
@@ -0,0 +1,26 @@
+
+
+
+
+
+
+
diff --git a/media/img/firefox/accounts/trailhead/icon-experiments.svg b/media/img/firefox/accounts/trailhead/icon-experiments.svg
new file mode 100644
index 00000000000..a5bb9f7ba1e
--- /dev/null
+++ b/media/img/firefox/accounts/trailhead/icon-experiments.svg
@@ -0,0 +1,4 @@
+
+
diff --git a/media/img/firefox/accounts/trailhead/icon-inbox.svg b/media/img/firefox/accounts/trailhead/icon-inbox.svg
new file mode 100644
index 00000000000..e4b20e081dc
--- /dev/null
+++ b/media/img/firefox/accounts/trailhead/icon-inbox.svg
@@ -0,0 +1,3 @@
+
+
diff --git a/media/img/firefox/accounts/trailhead/value-knowledge-high-res.jpg b/media/img/firefox/accounts/trailhead/value-knowledge-high-res.jpg
new file mode 100644
index 00000000000..15fe286ba08
Binary files /dev/null and b/media/img/firefox/accounts/trailhead/value-knowledge-high-res.jpg differ
diff --git a/media/img/firefox/accounts/trailhead/value-knowledge.jpg b/media/img/firefox/accounts/trailhead/value-knowledge.jpg
new file mode 100644
index 00000000000..d0f96447498
Binary files /dev/null and b/media/img/firefox/accounts/trailhead/value-knowledge.jpg differ
diff --git a/media/img/firefox/accounts/trailhead/value-respect-high-res.jpg b/media/img/firefox/accounts/trailhead/value-respect-high-res.jpg
new file mode 100644
index 00000000000..072362b6cef
Binary files /dev/null and b/media/img/firefox/accounts/trailhead/value-respect-high-res.jpg differ
diff --git a/media/img/firefox/accounts/trailhead/value-respect.jpg b/media/img/firefox/accounts/trailhead/value-respect.jpg
new file mode 100644
index 00000000000..8020d9c1f4c
Binary files /dev/null and b/media/img/firefox/accounts/trailhead/value-respect.jpg differ
diff --git a/media/img/firefox/home/bright.png b/media/img/firefox/home/bright.png
deleted file mode 100644
index a2f32cb801a..00000000000
Binary files a/media/img/firefox/home/bright.png and /dev/null differ
diff --git a/media/img/firefox/home/desktop-account.svg b/media/img/firefox/home/desktop-account.svg
index 7c50e3d4875..07d44ef1d19 100644
--- a/media/img/firefox/home/desktop-account.svg
+++ b/media/img/firefox/home/desktop-account.svg
@@ -1 +1 @@
-
+
\ No newline at end of file
diff --git a/media/img/firefox/home/desktop-smooth.svg b/media/img/firefox/home/desktop-smooth.svg
index 223443650c1..8fd09b6b3a4 100644
--- a/media/img/firefox/home/desktop-smooth.svg
+++ b/media/img/firefox/home/desktop-smooth.svg
@@ -1,28 +1 @@
-
-
-
-
-
-
-
-
-
-
-
+
\ No newline at end of file
diff --git a/media/img/firefox/home/hero-high-res.jpg b/media/img/firefox/home/hero-high-res.jpg
deleted file mode 100755
index d9b3467b4af..00000000000
Binary files a/media/img/firefox/home/hero-high-res.jpg and /dev/null differ
diff --git a/media/img/firefox/home/hero-small-high-res.jpg b/media/img/firefox/home/hero-small-high-res.jpg
index e7a0ef8a56e..badb0b01955 100644
Binary files a/media/img/firefox/home/hero-small-high-res.jpg and b/media/img/firefox/home/hero-small-high-res.jpg differ
diff --git a/media/img/firefox/home/hero-small.jpg b/media/img/firefox/home/hero-small.jpg
index bb0bb6cf223..94376db1e28 100644
Binary files a/media/img/firefox/home/hero-small.jpg and b/media/img/firefox/home/hero-small.jpg differ
diff --git a/media/img/firefox/home/hero.jpg b/media/img/firefox/home/hero.jpg
deleted file mode 100755
index 08d6e63e596..00000000000
Binary files a/media/img/firefox/home/hero.jpg and /dev/null differ
diff --git a/media/img/firefox/home/icon-extensions.svg b/media/img/firefox/home/icon-extensions.svg
index 011a166b321..23510db3e65 100644
--- a/media/img/firefox/home/icon-extensions.svg
+++ b/media/img/firefox/home/icon-extensions.svg
@@ -1 +1 @@
-
+
\ No newline at end of file
diff --git a/media/img/firefox/home/icon-faster.svg b/media/img/firefox/home/icon-faster.svg
index e580e988eac..80d420cedf8 100644
--- a/media/img/firefox/home/icon-faster.svg
+++ b/media/img/firefox/home/icon-faster.svg
@@ -1 +1 @@
-
+
\ No newline at end of file
diff --git a/media/img/firefox/home/icon-private.svg b/media/img/firefox/home/icon-private.svg
index 258cceaa735..bb703945dd0 100644
--- a/media/img/firefox/home/icon-private.svg
+++ b/media/img/firefox/home/icon-private.svg
@@ -1 +1 @@
-
+
\ No newline at end of file
diff --git a/media/img/firefox/home/icon-sprite.svg b/media/img/firefox/home/icon-sprite.svg
index 11a17a26cf0..680fb181063 100644
--- a/media/img/firefox/home/icon-sprite.svg
+++ b/media/img/firefox/home/icon-sprite.svg
@@ -1,68 +1 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
\ No newline at end of file
diff --git a/media/img/firefox/home/icon-theme.svg b/media/img/firefox/home/icon-theme.svg
index 7d01f95c4a1..9a675f4975e 100644
--- a/media/img/firefox/home/icon-theme.svg
+++ b/media/img/firefox/home/icon-theme.svg
@@ -1 +1 @@
-
+
\ No newline at end of file
diff --git a/media/img/firefox/home/icon-toolbar.svg b/media/img/firefox/home/icon-toolbar.svg
index 311bfe8279d..5ca4f4f24eb 100644
--- a/media/img/firefox/home/icon-toolbar.svg
+++ b/media/img/firefox/home/icon-toolbar.svg
@@ -1 +1 @@
-
+
\ No newline at end of file
diff --git a/media/img/firefox/home/icon-tracking.svg b/media/img/firefox/home/icon-tracking.svg
index 9c763db29ca..94f42671188 100644
--- a/media/img/firefox/home/icon-tracking.svg
+++ b/media/img/firefox/home/icon-tracking.svg
@@ -1 +1 @@
-
+
\ No newline at end of file
diff --git a/media/img/firefox/home/var-e-bg.svg b/media/img/firefox/home/var-e-bg.svg
new file mode 100644
index 00000000000..0497f4843f5
--- /dev/null
+++ b/media/img/firefox/home/var-e-bg.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/media/img/firefox/home/var-e-product.svg b/media/img/firefox/home/var-e-product.svg
new file mode 100644
index 00000000000..6195e7c0f84
--- /dev/null
+++ b/media/img/firefox/home/var-e-product.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/media/img/firefox/home/wave.svg b/media/img/firefox/home/wave.svg
index e9df9b69742..a570033691c 100644
--- a/media/img/firefox/home/wave.svg
+++ b/media/img/firefox/home/wave.svg
@@ -1 +1 @@
-
+
\ No newline at end of file
diff --git a/media/img/firefox/whatsnew_67/WNP-PDP-icon.svg b/media/img/firefox/whatsnew_67/WNP-PDP-icon.svg
new file mode 100644
index 00000000000..63abfafc60b
--- /dev/null
+++ b/media/img/firefox/whatsnew_67/WNP-PDP-icon.svg
@@ -0,0 +1,3 @@
+
+
diff --git a/media/img/firefox/whatsnew_67/WNP-knowledge-icon.svg b/media/img/firefox/whatsnew_67/WNP-knowledge-icon.svg
new file mode 100644
index 00000000000..d5eba8a4337
--- /dev/null
+++ b/media/img/firefox/whatsnew_67/WNP-knowledge-icon.svg
@@ -0,0 +1,7 @@
+
+
+
+
diff --git a/media/img/firefox/whatsnew_67/experiments.svg b/media/img/firefox/whatsnew_67/experiments.svg
new file mode 100644
index 00000000000..85c9c3735f8
--- /dev/null
+++ b/media/img/firefox/whatsnew_67/experiments.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/media/img/firefox/whatsnew_67/heart_glyph.svg b/media/img/firefox/whatsnew_67/heart_glyph.svg
new file mode 100644
index 00000000000..3d7d4e27ea9
--- /dev/null
+++ b/media/img/firefox/whatsnew_67/heart_glyph.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/media/img/firefox/whatsnew_67/inbox.svg b/media/img/firefox/whatsnew_67/inbox.svg
new file mode 100644
index 00000000000..1d92ec18525
--- /dev/null
+++ b/media/img/firefox/whatsnew_67/inbox.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/media/img/firefox/whatsnew_67/lockbox_glyph.png b/media/img/firefox/whatsnew_67/lockbox_glyph.png
new file mode 100755
index 00000000000..42f81b00bbe
Binary files /dev/null and b/media/img/firefox/whatsnew_67/lockbox_glyph.png differ
diff --git a/media/img/firefox/whatsnew_67/lockbox_glyph.svg b/media/img/firefox/whatsnew_67/lockbox_glyph.svg
new file mode 100644
index 00000000000..2b8bff4ff9d
--- /dev/null
+++ b/media/img/firefox/whatsnew_67/lockbox_glyph.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/media/img/firefox/whatsnew_67/monitor_icon.svg b/media/img/firefox/whatsnew_67/monitor_icon.svg
new file mode 100644
index 00000000000..91c4ff136ec
--- /dev/null
+++ b/media/img/firefox/whatsnew_67/monitor_icon.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/media/img/firefox/whatsnew_67/noodles.png b/media/img/firefox/whatsnew_67/noodles.png
new file mode 100644
index 00000000000..67f1bb5c9d7
Binary files /dev/null and b/media/img/firefox/whatsnew_67/noodles.png differ
diff --git a/media/img/firefox/whatsnew_67/protects_glyph.svg b/media/img/firefox/whatsnew_67/protects_glyph.svg
new file mode 100644
index 00000000000..abcea96862f
--- /dev/null
+++ b/media/img/firefox/whatsnew_67/protects_glyph.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/media/img/firefox/whatsnew_67/send_glyph.png b/media/img/firefox/whatsnew_67/send_glyph.png
new file mode 100755
index 00000000000..0361581c074
Binary files /dev/null and b/media/img/firefox/whatsnew_67/send_glyph.png differ
diff --git a/media/img/firefox/whatsnew_67/send_glyph.svg b/media/img/firefox/whatsnew_67/send_glyph.svg
new file mode 100644
index 00000000000..590769702b0
--- /dev/null
+++ b/media/img/firefox/whatsnew_67/send_glyph.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/media/img/logos/firefox/logo-lockwise.svg b/media/img/logos/firefox/logo-lockwise.svg
new file mode 100644
index 00000000000..fd86893011b
--- /dev/null
+++ b/media/img/logos/firefox/logo-lockwise.svg
@@ -0,0 +1,58 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/media/img/logos/firefox/logo-master-wordmark-dark.svg b/media/img/logos/firefox/logo-master-wordmark-dark.svg
new file mode 100644
index 00000000000..3d694d79ae2
--- /dev/null
+++ b/media/img/logos/firefox/logo-master-wordmark-dark.svg
@@ -0,0 +1,123 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/media/img/logos/firefox/logo-master-wordmark-light.svg b/media/img/logos/firefox/logo-master-wordmark-light.svg
new file mode 100644
index 00000000000..cd5ba26bf6c
--- /dev/null
+++ b/media/img/logos/firefox/logo-master-wordmark-light.svg
@@ -0,0 +1,123 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/media/img/logos/firefox/logo-monitor.svg b/media/img/logos/firefox/logo-monitor.svg
new file mode 100644
index 00000000000..3725ed3d916
--- /dev/null
+++ b/media/img/logos/firefox/logo-monitor.svg
@@ -0,0 +1,47 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/media/img/logos/firefox/logo-send.svg b/media/img/logos/firefox/logo-send.svg
new file mode 100644
index 00000000000..0668e50fcf6
--- /dev/null
+++ b/media/img/logos/firefox/logo-send.svg
@@ -0,0 +1,39 @@
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/media/img/mozorg/about/leadership/stan-leong-high-res.jpg b/media/img/mozorg/about/leadership/stan-leong-high-res.jpg
new file mode 100644
index 00000000000..c0b7f893c67
Binary files /dev/null and b/media/img/mozorg/about/leadership/stan-leong-high-res.jpg differ
diff --git a/media/img/mozorg/about/leadership/stan-leong.jpg b/media/img/mozorg/about/leadership/stan-leong.jpg
new file mode 100644
index 00000000000..e5801c6781a
Binary files /dev/null and b/media/img/mozorg/about/leadership/stan-leong.jpg differ
diff --git a/media/js/base/mozilla-fxa-form.js b/media/js/base/mozilla-fxa-form.js
index b0d55ab0d65..d6134cce63d 100644
--- a/media/js/base/mozilla-fxa-form.js
+++ b/media/js/base/mozilla-fxa-form.js
@@ -12,6 +12,8 @@ Mozilla.FxaForm = (function(Mozilla) {
var fxaForm = document.getElementById('fxa-email-form');
var fxaSubmitButton = document.getElementById('fxa-email-form-submit');
+ var fxaFormContextField = fxaForm.querySelector('[name="context"]');
+ var fxaFormServiceField = fxaForm.querySelector('[name="service"]');
var supportsFetch = 'fetch' in window;
@@ -71,9 +73,14 @@ Mozilla.FxaForm = (function(Mozilla) {
}
if (fxaForm) {
- // form is Firefox only right now
+ // Sync is Firefox only
if (Mozilla.Client.isFirefox) {
init();
+ } else {
+ // Omit the fields required for sync.
+ // This allows non-Firefoxes to create accounts.
+ fxaFormContextField.remove();
+ fxaFormServiceField.remove();
}
}
})(window.Mozilla);
diff --git a/media/js/base/mozilla-monitor-button.js b/media/js/base/mozilla-monitor-button.js
new file mode 100644
index 00000000000..7d98f0a44ab
--- /dev/null
+++ b/media/js/base/mozilla-monitor-button.js
@@ -0,0 +1,36 @@
+/* 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 = {};
+}
+
+Mozilla.MonitorButton = (function() {
+ 'use strict';
+
+ var monitorButton = document.getElementById('fxa-monitor-submit');
+ var buttonURL = monitorButton.getAttribute('href');
+
+ // fetch request
+ var supportsFetch = 'fetch' in window;
+
+ if (!supportsFetch) {
+ return;
+ }
+
+ var destURL = monitorButton.getAttribute('data-action') + 'metrics-flow';
+
+ fetch(destURL).then(function(resp) {
+ return resp.json();
+ }).then(function(r) {
+ // add retrieved flowBeginTime and flowId values to cta url
+ buttonURL += '&flowBeginTime=' + r.flowBeginTime;
+ buttonURL += '&flowId=' + r.flowId;
+ monitorButton.setAttribute('href', buttonURL);
+ }).catch(function() {
+ // silently fail, leaving flow_id and flow_begin_time as default empty value
+ });
+})();
+
diff --git a/media/js/firefox/accounts-2019.js b/media/js/firefox/accounts-2019.js
new file mode 100644
index 00000000000..7b59e4663c7
--- /dev/null
+++ b/media/js/firefox/accounts-2019.js
@@ -0,0 +1,44 @@
+/* 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 fxaSigninLink = document.querySelector('.fxa-signin a');
+ var fxaSigninURI = fxaSigninLink.href;
+
+ // Remove a given paramater from a URL query string
+ // Taken from https://stackoverflow.com/questions/16941104/remove-a-parameter-to-the-url-with-javascript
+ function removeParam(key, sourceURL) {
+ var rtn = sourceURL.split('?')[0];
+ var param;
+ var paramsArray = [];
+ var queryString = (sourceURL.indexOf('?') !== -1) ? sourceURL.split('?')[1] : '';
+
+ if (queryString !== '') {
+ paramsArray = queryString.split('&');
+ for (var i = paramsArray.length - 1; i >= 0; i -= 1) {
+ param = paramsArray[i].split('=')[0];
+ if (param === key) {
+ paramsArray.splice(i, 1);
+ }
+ }
+ rtn = rtn + '?' + paramsArray.join('&');
+ }
+ return rtn;
+ }
+
+ // Sync is Firefox only so remove the Sync params for non-Firefoxes
+ if (!Mozilla.Client.isFirefox) {
+ // First remove the context param
+ var revisedFxaSigninURI = removeParam('context', fxaSigninURI);
+
+ // Then remove the service param
+ var finalFxaSigninURI = removeParam('service', revisedFxaSigninURI);
+
+ // Set the link
+ fxaSigninLink.href = finalFxaSigninURI;
+ }
+
+})(window.Mozilla);
diff --git a/media/js/firefox/home/experiment-brand.js b/media/js/firefox/home/experiment-brand.js
index 33a324c3dce..4f2f193b708 100644
--- a/media/js/firefox/home/experiment-brand.js
+++ b/media/js/firefox/home/experiment-brand.js
@@ -8,8 +8,11 @@
var cop = new Mozilla.TrafficCop({
id: 'experiment_firefox_desktop_brand',
variations: {
- 'v=a': 93, // control
- 'v=b': 7 // new brand
+ 'v=a': 2, // control
+ 'v=b': 2, // new brand
+ 'v=c': 2, // new brand, no quantum
+ 'v=d': 2, // new brand, browser in headline
+ 'v=e': 2 // new brand, product image
}
});
diff --git a/media/js/firefox/home/experiment-variation-brand.js b/media/js/firefox/home/experiment-variation-brand.js
new file mode 100644
index 00000000000..e3fe296212b
--- /dev/null
+++ b/media/js/firefox/home/experiment-variation-brand.js
@@ -0,0 +1,18 @@
+/* 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 body = document.getElementsByTagName('body')[0];
+ var variation = body.getAttribute('data-variant') || false;
+
+ if (variation) {
+ window.dataLayer.push({
+ 'data-ex-name': 'firefox_desktop_brand',
+ 'data-ex-variant': 'v_' + variation
+ });
+ }
+
+})();
diff --git a/media/js/firefox/home/pre-download-newsletter-protocol.js b/media/js/firefox/home/pre-download-newsletter-protocol.js
deleted file mode 100644
index 9d40e6bbd8f..00000000000
--- a/media/js/firefox/home/pre-download-newsletter-protocol.js
+++ /dev/null
@@ -1,33 +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';
-
- // Show email newsletter modal on download button click.
- var downloadButton = document.querySelectorAll('.download-link[data-download-os="Desktop"]');
- var newsletterContent = document.getElementById('pre-download-modal');
-
- for(var i = 0; i < downloadButton.length; i++) {
- downloadButton[i].setAttribute('role', 'button');
- downloadButton[i].addEventListener('click', function(e) {
- e.preventDefault();
-
- Mzp.Modal.createModal(e.target, newsletterContent, {
- title: 'Download Firefox and sign up',
- className: 'mzp-t-firefox l-compact',
- closeText: window.Mozilla.Utils.trans('global-close'),
- });
- }, false);
- }
-
- // Listen for the newsletter sucess event
- document.addEventListener('newsletterSuccess', function () {
- // Close the modal
- Mzp.Modal.closeModal();
-
- // Redirect to /download/thanks/
- window.location.href = document.querySelector('.pre-download-continue a').href;
- }, false);
-})();
diff --git a/media/js/firefox/new/trailhead/variation.js b/media/js/firefox/new/trailhead/variation.js
deleted file mode 100644
index 52abb52bb5e..00000000000
--- a/media/js/firefox/new/trailhead/variation.js
+++ /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/. */
-
-(function(Mozilla) {
- 'use strict';
-
- var variation = document.querySelector('.main-download').getAttribute('data-variant');
-
- function setAttribution(variation) {
- var params = {
- /* eslint-disable camelcase */
- utm_source: 'www.mozilla.org',
- utm_medium: 'experiment',
- utm_campaign: 'firefox_new_trailhead',
- utm_content: 'firefox_new_trailhead_v_' + variation
- /* eslint-enable camelcase */
- };
-
- function trackGAEvent() {
- window.dataLayer.push({
- 'data-ex-name': 'firefox_new_trailhead',
- 'data-ex-variant': 'v_' + variation
- });
- }
-
- Mozilla.CustomStubAttribution.init(params, trackGAEvent);
- }
-
- if (variation) {
- setAttribution(variation);
- }
-
-})(window.Mozilla);
diff --git a/media/js/mozorg/perf-exp/control.js b/media/js/mozorg/perf-exp/control.js
new file mode 100644
index 00000000000..9ad7a607e80
--- /dev/null
+++ b/media/js/mozorg/perf-exp/control.js
@@ -0,0 +1,12 @@
+/* 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';
+
+ window.dataLayer.push({
+ 'data-ex-name': 'about_page_performance',
+ 'data-ex-variant': 'v_a'
+ });
+})();
diff --git a/media/js/firefox/new/trailhead/experiment.js b/media/js/mozorg/perf-exp/experiment.js
similarity index 55%
rename from media/js/firefox/new/trailhead/experiment.js
rename to media/js/mozorg/perf-exp/experiment.js
index 0f0431a05fe..565b21756b0 100644
--- a/media/js/firefox/new/trailhead/experiment.js
+++ b/media/js/mozorg/perf-exp/experiment.js
@@ -5,20 +5,21 @@
(function() {
'use strict';
- var isFirefox = /\sFirefox/.test(navigator.userAgent);
-
- if (window.site.platform !== 'windows' || isFirefox) {
- return;
- }
-
var cop = new Mozilla.TrafficCop({
- id: 'experiment-firefox-new-pre-download',
+ id: 'experiment-about-page-performance',
variations: {
- 'xv=th&v=a': 2, // control
- 'xv=th&v=b': 2 // redesign
+ 'v=a': 2,
+ 'v=b': 2,
+ 'v=c': 2,
+ 'v=d': 2,
+ 'v=e': 2,
+ 'v=f': 2,
+ 'v=g': 2,
+ 'v=h': 2,
+ 'v=i': 2,
+ 'v=j': 2
}
});
cop.init();
-
})();
diff --git a/media/js/mozorg/perf-exp/variation.js b/media/js/mozorg/perf-exp/variation.js
new file mode 100644
index 00000000000..2791dbbfee1
--- /dev/null
+++ b/media/js/mozorg/perf-exp/variation.js
@@ -0,0 +1,123 @@
+/* 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 variation = document.querySelector('.mzp-c-hero.t-mission').getAttribute('data-variant');
+
+ function setDelay() {
+ var delay = {
+ backgrounds: null,
+ fonts: null,
+ images: null,
+ text: null,
+ ui: null,
+ };
+
+ switch(variation) {
+ case 'b':
+ delay.backgrounds = 0;
+ delay.fonts = 1000;
+ delay.images = 750;
+ delay.text = 0;
+ delay.ui = 0;
+ break;
+ case 'c':
+ delay.backgrounds = 750;
+ delay.fonts = 2000;
+ delay.images = 1500;
+ delay.text = 500;
+ delay.ui = 500;
+ break;
+ case 'd':
+ delay.backgrounds = 1500;
+ delay.fonts = 3000;
+ delay.images = 2250;
+ delay.text = 1000;
+ delay.ui = 1000;
+ break;
+ case 'e':
+ delay.backgrounds = 2250;
+ delay.fonts = 4000;
+ delay.images = 3000;
+ delay.text = 1500;
+ delay.ui = 1500;
+ break;
+ case 'f':
+ delay.backgrounds = 3000;
+ delay.fonts = 5000;
+ delay.images = 3750;
+ delay.text = 3000;
+ delay.ui = 3000;
+ break;
+ case 'g':
+ delay.backgrounds = 3750;
+ delay.fonts = 6000;
+ delay.images = 4500;
+ delay.text = 3500;
+ delay.ui = 3500;
+ break;
+ case 'h':
+ delay.backgrounds = 4500;
+ delay.fonts = 7000;
+ delay.images = 5250;
+ delay.text = 4000;
+ delay.ui = 4000;
+ break;
+ case 'i':
+ delay.backgrounds = 5250;
+ delay.fonts = 8000;
+ delay.images = 6000;
+ delay.text = 4500;
+ delay.ui = 4500;
+ break;
+ case 'j':
+ delay.backgrounds = 6000;
+ delay.fonts = 9000;
+ delay.images = 6750;
+ delay.text = 5000;
+ delay.ui = 5000;
+ break;
+ default:
+ delay.backgrounds = 0;
+ delay.fonts = 0;
+ delay.images = 0;
+ delay.text = 0;
+ delay.ui = 0;
+ }
+
+ return delay;
+ }
+
+
+ var delay = setDelay();
+
+ setTimeout(function() {
+ document.querySelector('body').classList.remove('backgrounds-invisible');
+ }, delay.backgrounds);
+
+ setTimeout(function() {
+ document.querySelector('body').classList.remove('ui-invisible');
+ }, delay.ui);
+
+ setTimeout(function() {
+ document.querySelector('body').classList.remove('text-invisible');
+ }, delay.text);
+
+ setTimeout(function() {
+ // Lazyload images
+ Mozilla.LazyLoad.init();
+ document.querySelector('body').classList.remove('images-invisible');
+ }, delay.images);
+
+ setTimeout(function() {
+ document.querySelector('body').classList.remove('fonts-delayed');
+ }, delay.fonts);
+
+ window.dataLayer.push({
+ 'data-ex-name': 'about_page_performance',
+ 'data-ex-variant': 'v_' + variation
+ });
+})();
diff --git a/media/static-bundles.json b/media/static-bundles.json
index fb204f61e21..33e45ab5dfa 100644
--- a/media/static-bundles.json
+++ b/media/static-bundles.json
@@ -486,6 +486,12 @@
],
"name": "about-en"
},
+ {
+ "files": [
+ "css/mozorg/perf-exp/index.scss"
+ ],
+ "name": "about-page-performance"
+ },
{
"files": [
"css/styleguide/styleguide.scss"
@@ -564,6 +570,12 @@
],
"name": "firefox_whatsnew_67"
},
+ {
+ "files": [
+ "css/firefox/whatsnew/whatsnew-67.0.5.scss"
+ ],
+ "name": "firefox_whatsnew_67.0.5"
+ },
{
"files": [
"css/mozorg/commit-access-policy.less"
@@ -700,8 +712,7 @@
{
"files": [
"css/base/mozilla-lazy-image.scss",
- "css/firefox/home/protocol.scss",
- "css/firefox/home/pre-download-newsletter-protocol.scss"
+ "css/firefox/home/protocol.scss"
],
"name": "firefox-desktop"
},
@@ -801,6 +812,14 @@
],
"name": "firefox_accounts_2018"
},
+ {
+ "files": [
+ "css/base/mozilla-fxa-state.scss",
+ "css/base/mozilla-fxa-form.scss",
+ "css/firefox/accounts-2019.scss"
+ ],
+ "name": "firefox_accounts_2019"
+ },
{
"files": [
"css/base/mozilla-fxa-state.scss",
@@ -1021,16 +1040,14 @@
},
{
"files": [
- "js/base/mozilla-traffic-cop.js",
- "js/firefox/new/trailhead/experiment.js"
- ],
- "name": "experiment_firefox_new_trailhead"
- },
- {
- "files": [
- "js/firefox/new/trailhead/variation.js"
+ "js/base/uitour-lib.js",
+ "js/base/mozilla-fxa.js",
+ "js/base/mozilla-fxa-init.js",
+ "js/base/mozilla-fxa-form.js",
+ "js/base/mozilla-monitor-button.js",
+ "protocol/js/protocol-modal.js"
],
- "name": "experiment_firefox_new_trailhead_variation"
+ "name": "firefox_whatsnew_67.0.5"
},
{
"files": [
@@ -1171,6 +1188,33 @@
],
"name": "about-en"
},
+ {
+ "files": [
+ "protocol/js/protocol-newsletter.js",
+ "js/newsletter/form-protocol.js",
+ "js/base/mozilla-lazy-load.js"
+ ],
+ "name": "about-page-performance"
+ },
+ {
+ "files": [
+ "js/mozorg/perf-exp/variation.js"
+ ],
+ "name": "about-page-performance-control"
+ },
+ {
+ "files": [
+ "js/mozorg/perf-exp/variation.js"
+ ],
+ "name": "about-page-performance-variation"
+ },
+ {
+ "files": [
+ "js/base/mozilla-traffic-cop.js",
+ "js/mozorg/perf-exp/experiment.js"
+ ],
+ "name": "experiment-about-page-performance"
+ },
{
"files": [
"js/base/mozilla-video-poster.js",
@@ -1255,6 +1299,16 @@
],
"name": "firefox-home"
},
+ {
+ "files": [
+ "js/libs/jquery.waypoints.min.js",
+ "js/libs/jquery.waypoints-sticky.min.js",
+ "js/hubs/sub-nav.js",
+ "js/base/mozilla-lazy-load.js",
+ "js/firefox/home/main.js"
+ ],
+ "name": "firefox-desktop"
+ },
{
"files": [
"js/base/mozilla-traffic-cop.js",
@@ -1264,20 +1318,13 @@
},
{
"files": [
- "js/libs/jquery.waypoints.min.js",
- "js/libs/jquery.waypoints-sticky.min.js",
- "js/hubs/sub-nav.js",
- "js/base/mozilla-lazy-load.js",
- "js/firefox/home/main.js",
- "protocol/js/protocol-newsletter.js",
- "js/newsletter/form-protocol.js"
+ "js/firefox/home/experiment-variation-brand.js"
],
- "name": "firefox-desktop"
+ "name": "experiment-variation-firefox-brand"
},
{
"files": [
- "protocol/js/protocol-modal.js",
- "js/firefox/home/pre-download-newsletter-protocol.js"
+ "protocol/js/protocol-modal.js"
],
"name": "pre-download-newsletter-protocol"
},
@@ -1418,6 +1465,15 @@
],
"name": "firefox_accounts_2018"
},
+ {
+ "files": [
+ "js/base/mozilla-fxa.js",
+ "js/base/mozilla-fxa-init.js",
+ "js/base/mozilla-fxa-form.js",
+ "js/firefox/accounts-2019.js"
+ ],
+ "name": "firefox_accounts_2019"
+ },
{
"files": [
"protocol/js/protocol-modal.js",
diff --git a/tests/functional/firefox/new/test_download.py b/tests/functional/firefox/new/test_download.py
index ac81611a53a..34d9caf5cf3 100644
--- a/tests/functional/firefox/new/test_download.py
+++ b/tests/functional/firefox/new/test_download.py
@@ -24,22 +24,9 @@ def test_click_download_button(base_url, selenium):
assert thank_you_page.seed_url in selenium.current_url
-# This test is running temporarily against the `de` whilst `en-US` test is running
-# See: https://github.com/mozilla/bedrock/issues/7140
@pytest.mark.nondestructive
def test_other_platforms_modal(base_url, selenium):
- page = DownloadPage(selenium, base_url, locale='de', params='').open()
+ page = DownloadPage(selenium, base_url, params='').open()
modal = page.open_other_platforms_modal()
assert modal.is_displayed
modal.close()
-
-
-# This test is running temporarily against the `de` whilst `en-US` test is running
-# See: https://github.com/mozilla/bedrock/issues/7140
-@pytest.mark.nondestructive
-@pytest.mark.skip_if_not_firefox(reason='Create Account form is only displayed to Firefox users')
-def test_firefox_account_modal(base_url, selenium):
- page = DownloadPage(selenium, base_url, locale='de', params='').open()
- modal = page.open_firefox_account_modal()
- assert modal.is_displayed
- modal.close()
diff --git a/tests/functional/firefox/new/test_download_yandex.py b/tests/functional/firefox/new/test_download_yandex.py
index ecaa6830997..5bd1bbb72e8 100644
--- a/tests/functional/firefox/new/test_download_yandex.py
+++ b/tests/functional/firefox/new/test_download_yandex.py
@@ -23,7 +23,7 @@ def test_yandex_download_button_displayed(base_url, selenium):
@pytest.mark.nondestructive
def test_other_platforms_modal(base_url, selenium):
- page = DownloadPage(selenium, base_url, params='?geo=us').open()
- modal = page.open_other_platforms_modal()
+ page = DownloadPage(selenium, base_url, locale='ru', params='?geo=us').open()
+ modal = page.open_legacy_other_platforms_modal()
assert modal.is_displayed
modal.close()
diff --git a/tests/functional/firefox/test_accounts.py b/tests/functional/firefox/test_accounts.py
index 3505d3097d0..b3134289fc1 100644
--- a/tests/functional/firefox/test_accounts.py
+++ b/tests/functional/firefox/test_accounts.py
@@ -7,19 +7,8 @@
from pages.firefox.accounts import FirefoxAccountsPage
-# test Firefox state
-@pytest.mark.skip_if_not_firefox(reason='Non-Firefox user does not see Firefox state')
+@pytest.mark.skip(reason='Page is temporarily behind the switch "firefox_accounts_trailhead"')
@pytest.mark.nondestructive
-def test_firefox_state(base_url, selenium):
+def test_account_form(base_url, selenium):
page = FirefoxAccountsPage(selenium, base_url).open()
- assert not page.are_download_buttons_displayed, "Download buttons are displayed for Firefox user"
- assert page.is_create_account_form_displayed, "Create account form is not displayed for Firefox user"
-
-
-# test non-Firefox state
-@pytest.mark.skip_if_firefox(reason='Firefox user does not see non-Firefox state')
-@pytest.mark.nondestructive
-def test_non_firefox_state(base_url, selenium):
- page = FirefoxAccountsPage(selenium, base_url).open()
- assert page.are_download_buttons_displayed, "Download buttons are not displayed for non-Firefox user"
- assert not page.is_create_account_form_displayed, "Create account form is displayed for non-Firefox user"
+ assert page.is_create_account_form_displayed, "Create account form is displayed for signed out users"
diff --git a/tests/functional/test_about.py b/tests/functional/test_about.py
index ec74f1b55fb..73fd3e726a6 100644
--- a/tests/functional/test_about.py
+++ b/tests/functional/test_about.py
@@ -7,6 +7,7 @@
from pages.about import AboutPage
+@pytest.mark.skip(reason='https://github.com/mozilla/bedrock/issues/7118')
@pytest.mark.nondestructive
def test_read_mission_button_displayed(base_url, selenium):
page = AboutPage(selenium, base_url).open()
diff --git a/tests/pages/firefox/accounts.py b/tests/pages/firefox/accounts.py
index 58a37b7e4a6..14d8aff83a7 100644
--- a/tests/pages/firefox/accounts.py
+++ b/tests/pages/firefox/accounts.py
@@ -14,7 +14,6 @@ class FirefoxAccountsPage(FirefoxBasePage):
URL_TEMPLATE = '/{locale}/firefox/accounts/'
- _download_buttons_locator = (By.CLASS_NAME, 'features-download')
_create_account_form_locator = (By.ID, 'fxa-email-form')
@property
@@ -25,12 +24,3 @@ def is_create_account_form_displayed(self):
return result
except TimeoutException:
return False
-
- @property
- def are_download_buttons_displayed(self):
- wait = Wait(self, timeout=3)
- try:
- result = wait.until(expected.visibility_of_all_elements_located((self._download_buttons_locator)))
- return result
- except TimeoutException:
- return False
diff --git a/tests/pages/firefox/new/download.py b/tests/pages/firefox/new/download.py
index 069cfb934c1..d8d175e06da 100644
--- a/tests/pages/firefox/new/download.py
+++ b/tests/pages/firefox/new/download.py
@@ -6,7 +6,7 @@
from pages.firefox.base import FirefoxBasePage
from pages.regions.download_button import DownloadButton
-from pages.regions.modal import Modal
+from pages.regions.modal import Modal, ModalProtocol
class DownloadPage(FirefoxBasePage):
@@ -14,9 +14,10 @@ class DownloadPage(FirefoxBasePage):
URL_TEMPLATE = '/{locale}/firefox/new/{params}'
_download_button_locator = (By.ID, 'download-button-desktop-release')
- _platforms_modal_link_locator = (By.ID, 'other-platforms-modal-link')
- _platforms_modal_content_locator = (By.ID, 'other-platforms')
- _account_modal_content_locator = (By.ID, 'firefox-account')
+ _platforms_modal_link_locator = (By.CLASS_NAME, 'js-platform-modal-button')
+ _platforms_modal_content_locator = (By.CLASS_NAME, 'mzp-u-modal-content')
+ _legacy_platforms_modal_link_locator = (By.ID, 'other-platforms-modal-link')
+ _legacy_platforms_modal_content_locator = (By.ID, 'other-platforms')
@property
def download_button(self):
@@ -29,13 +30,13 @@ def download_firefox(self):
return ThankYouPage(self.selenium, self.base_url).wait_for_page_to_load()
def open_other_platforms_modal(self):
- modal = Modal(self)
+ modal = ModalProtocol(self)
self.find_element(*self._platforms_modal_link_locator).click()
self.wait.until(lambda s: modal.displays(self._platforms_modal_content_locator))
return modal
- def open_firefox_account_modal(self):
+ def open_legacy_other_platforms_modal(self):
modal = Modal(self)
- self.download_button.click()
- self.wait.until(lambda s: modal.displays(self._account_modal_content_locator))
+ self.find_element(*self._legacy_platforms_modal_link_locator).click()
+ self.wait.until(lambda s: modal.displays(self._legacy_platforms_modal_content_locator))
return modal
diff --git a/tests/pages/regions/modal.py b/tests/pages/regions/modal.py
index d08c8292616..c0b9a1c0c02 100644
--- a/tests/pages/regions/modal.py
+++ b/tests/pages/regions/modal.py
@@ -23,3 +23,21 @@ def is_displayed(self):
def displays(self, selector):
return self.is_element_displayed(*selector)
+
+
+class ModalProtocol(Region):
+
+ _root_locator = (By.CLASS_NAME, 'mzp-c-modal')
+ _close_locator = (By.CLASS_NAME, 'mzp-c-modal-button-close')
+
+ def close(self):
+ modal = self.selenium.find_element(*self._root_locator)
+ self.find_element(*self._close_locator).click()
+ self.wait.until(expected.staleness_of(modal))
+
+ @property
+ def is_displayed(self):
+ return self.page.is_element_displayed(*self._root_locator)
+
+ def displays(self, selector):
+ return self.is_element_displayed(*selector)
diff --git a/tests/redirects/map_301.py b/tests/redirects/map_301.py
index 0b0d72d1b6e..fadf62e6909 100644
--- a/tests/redirects/map_301.py
+++ b/tests/redirects/map_301.py
@@ -2085,6 +2085,7 @@
'http://developer.mozilla.org/en/Debugging_Mozilla_on_Linux_FAQ'),
url_test('/unix/solaris-build.html',
'http://developer.mozilla.org/en/Mozilla_Build_FAQ#Unix-specific_questions'),
+ url_test('/unix/customizing.html', 'https://www-archive.mozilla.org/unix/customizing.html'),
url_test('/webtools', 'https://developer.mozilla.org/en/Mozilla_Development_Tools'),
url_test('/xmlextras/', 'http://developer.mozilla.org/en/XML_Extras'),
url_test('/xmlextras/xmldataislands/example1.html',