From f264fd74ab7b9e7e8bad3d7acf70ba2f32521ce6 Mon Sep 17 00:00:00 2001 From: Reem H <42309026+reemhamz@users.noreply.github.com> Date: Wed, 28 Feb 2024 17:16:06 +1100 Subject: [PATCH] Updating Twitter references and icons to Xitter [fixes #13980] (#14041) * updating Twitter to Xitter * updated more references and links and images to pages * PR fixes and updating welcome pages footers * PR fixes #2 * added a11y to social links in leaderpship pages --- .../includes/protocol/footer/footer.html | 4 +-- .../templates/careers/includes/footer.html | 2 +- .../templates/firefox/nightly/whatsnew.html | 2 +- .../templates/firefox/privacy/book.html | 4 +-- .../firefox/releases/nightly-notes.html | 2 +- .../about/leadership/includes/boards.html | 12 ++++---- .../about/leadership/includes/executive.html | 10 +++---- .../about/leadership/includes/mofo.html | 8 +++--- .../about/leadership/includes/senior.html | 4 +-- .../templates/mozorg/about/manifesto.html | 6 ++-- .../mozorg/contact/contact-landing.html | 2 +- .../newsletter/opt-out-confirmation.html | 2 +- .../pocket/templates/pocket/contact-info.html | 2 +- .../pocket/includes/footer-platform.html | 6 ++-- .../stories/stories-base-article.html | 2 +- l10n/en/firefox/nightly/whatsnew.ftl | 7 +++++ l10n/en/firefox/privacy/book.ftl | 4 +++ l10n/en/footer.ftl | 5 ++++ l10n/en/mozorg/about/manifesto.ftl | 5 ++++ l10n/en/newsletter/opt-out-confirmation.ftl | 3 ++ media/css/careers/components/footer.scss | 2 +- media/css/firefox/switch.scss | 1 + media/css/firefox/welcome11.scss | 6 +++- media/css/firefox/welcome12.scss | 6 +++- media/css/firefox/welcome13.scss | 6 +++- media/css/firefox/welcome15.scss | 2 +- media/css/firefox/welcome16.scss | 2 +- media/css/firefox/welcome17.scss | 2 +- .../firefox/whatsnew/includes/_dark-mode.scss | 2 +- media/css/mozorg/leadership.scss | 8 +++++- .../newsletter-opt-out-confirmation.scss | 23 ++++++++------- media/css/pocket/includes/_footer.scss | 16 ++--------- .../css/pocket/includes/_platform-footer.scss | 7 +++-- media/css/protocol/components/_footer.scss | 6 +++- media/css/stories/stories-article.scss | 6 ++-- .../logos/social/social-icon-sprite-dark.svg | 2 +- media/img/logos/social/social-icon-sprite.svg | 28 ------------------- media/img/logos/social/x-icon-black.svg | 3 ++ media/img/logos/social/x-icon-white.svg | 3 ++ 39 files changed, 118 insertions(+), 105 deletions(-) delete mode 100644 media/img/logos/social/social-icon-sprite.svg create mode 100644 media/img/logos/social/x-icon-black.svg create mode 100644 media/img/logos/social/x-icon-white.svg diff --git a/bedrock/base/templates/includes/protocol/footer/footer.html b/bedrock/base/templates/includes/protocol/footer/footer.html index 85f49c6c90..317ba84675 100644 --- a/bedrock/base/templates/includes/protocol/footer/footer.html +++ b/bedrock/base/templates/includes/protocol/footer/footer.html @@ -75,7 +75,7 @@ Notes Feed and News Feed. Also, don’t forget to follow us on - Twitter! + X (formerly Twitter)! {%- endwith -%}
{% endblock %} diff --git a/bedrock/mozorg/templates/mozorg/about/leadership/includes/boards.html b/bedrock/mozorg/templates/mozorg/about/leadership/includes/boards.html index 48f09f93ae..55d68d3dd5 100644 --- a/bedrock/mozorg/templates/mozorg/about/leadership/includes/boards.html +++ b/bedrock/mozorg/templates/mozorg/about/leadership/includes/boards.html @@ -27,8 +27,8 @@ {% endblock %} diff --git a/bedrock/firefox/templates/firefox/releases/nightly-notes.html b/bedrock/firefox/templates/firefox/releases/nightly-notes.html index e291399831..77031781f1 100644 --- a/bedrock/firefox/templates/firefox/releases/nightly-notes.html +++ b/bedrock/firefox/templates/firefox/releases/nightly-notes.html @@ -46,7 +46,7 @@ {%- with twitter='https://twitter.com/FirefoxNightly' -%} ProTip: Be the first to know the latest changes by subscribing to the NightlyExecutive Chair of the Board, Member of the Nominating and Governance Committee
Amy’s career has focused on enabling open data and the advancement of @@ -507,8 +507,8 @@ enabling technological innovation across and beyond Emerson Collective.
Over the past decades, Raffi has helped companies and organizations build teams - and tech infrastructure designed for impact. He was an executive at Twitter running a - global engineering team focused on making Twitter available and performant for the + and tech infrastructure designed for impact. He was an executive at X (formerly Twitter) running a + global engineering team focused on making X available and performant for the world. At Uber, he helped start and run the self-driving efforts tasked with building and deploying the first-ever self-driving and passenger carrying fleet in record time. His experiences at these industry- and world- changing companies gave him deep @@ -715,7 +715,7 @@
Formerly, Nicole served as Deputy U.S. Chief Technology Officer in the Obama Administration, focused on internet, privacy, and innovation policy. Prior to her time in government, Nicole was Google’s Vice President and - Deputy General Counsel, and Twitter’s Legal Director for Products. She + Deputy General Counsel, and X's (formerly Twitter) Legal Director for Products. She frequently speaks on issues related to law and technology, including five appearances before the U.S. Congress.
diff --git a/bedrock/mozorg/templates/mozorg/about/leadership/includes/executive.html b/bedrock/mozorg/templates/mozorg/about/leadership/includes/executive.html index 18cb98b51b..b759aec49b 100644 --- a/bedrock/mozorg/templates/mozorg/about/leadership/includes/executive.html +++ b/bedrock/mozorg/templates/mozorg/about/leadership/includes/executive.html @@ -174,7 +174,7 @@ file, You can obtain one at https://mozilla.org/MPL/2.0/.Chief Product Officer
Previously, Steve worked at Twitter as a Vice President of Product for +
Previously, Steve worked at X (formerly Twitter) as a Vice President of Product for their Machine Learning and Data platforms. Prior to that, Steve led Product Management, Design and Research in Facebook’s Infrastructure organization. He also spent almost 14 years at Microsoft where he was responsible for @@ -401,7 +401,7 @@ file, You can obtain one at https://mozilla.org/MPL/2.0/.
President
Senior Vice President of Global Advocacy
Chief Operating Officer
Prior to Alchemy, Brandon worked at Twitter as head of global communications. +
Prior to Alchemy, Brandon worked at X (formerly Twitter) as head of global communications. While there, he helped lead the company's efforts to better secure the conversation around elections globally and played a key role in redefining - the product narrative, as Twitter made its first significant product + the product narrative, as X made its first significant product charges in more than a decade. He has also led communications at Ancestry, helped Quantcast make a pivot to AI, led the crisis communications team at United Airlines, and worked at the Joele Frank and Brunswick Group, diff --git a/bedrock/mozorg/templates/mozorg/about/manifesto.html b/bedrock/mozorg/templates/mozorg/about/manifesto.html index 04abe2d9dc..bfb8c3289d 100644 --- a/bedrock/mozorg/templates/mozorg/about/manifesto.html +++ b/bedrock/mozorg/templates/mozorg/about/manifesto.html @@ -77,8 +77,8 @@ include_cta=True, ) %}
- - {{ ftl('manifesto-share-on-twitter') }} + + {{ ftl('manifesto-share-on-x', fallback='manifesto-share-on-twitter') }}
{% endcall %} @@ -131,7 +131,7 @@ diff --git a/bedrock/mozorg/templates/mozorg/contact/contact-landing.html b/bedrock/mozorg/templates/mozorg/contact/contact-landing.html index 099a51369f..e3e99494ac 100644 --- a/bedrock/mozorg/templates/mozorg/contact/contact-landing.html +++ b/bedrock/mozorg/templates/mozorg/contact/contact-landing.html @@ -51,7 +51,7 @@Twitter (@pocket, @pocketsupport)
+X (formerly Twitter) (@pocket, @pocketsupport)
diff --git a/bedrock/pocket/templates/pocket/includes/footer-platform.html b/bedrock/pocket/templates/pocket/includes/footer-platform.html index 2b0d9d2179..9fe118500b 100644 --- a/bedrock/pocket/templates/pocket/includes/footer-platform.html +++ b/bedrock/pocket/templates/pocket/includes/footer-platform.html @@ -30,10 +30,8 @@ width="28px" height="28px" > -