Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

SEI Evergreen page #14595

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<div class="c-menu-panel-container">
<button class="c-menu-button-close" type="button" aria-controls="c-menu-panel-about">{{ ftl('navigation-v2-close-who-we-are-menu', fallback='navigation-close-about-menu') }}</button>
<div class="c-menu-panel-content">
<ul class="mzp-l-rows-three">
<ul class="mzp-l-rows-four">
<li>
<section class="c-menu-item mzp-has-icon">
<a class="c-menu-item-link" href="{{ url('mozorg.about.manifesto') }}" data-link-text="Mozilla Manifesto" data-link-type="nav" data-link-position="topnav" data-link-group="who-we-are">
Expand Down Expand Up @@ -74,6 +74,18 @@ <h4 class="c-menu-item-title">{{ ftl('navigation-v2-mozilla-blog') }}</h4>
</section>
</li>

{% if ftl_has_messages('navigation-v2-impact', 'navigation-v2-find-out-how') %}
Copy link
Contributor Author

@reemhamz reemhamz Jul 18, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I added this helper here as well so locales that haven't been translated for yet don't see this bit. However this Impact page is strictly in English so I don't know how critical this helper is to add

<li>
<section class="c-menu-item mzp-has-icon">
<a class="c-menu-item-link" href="{{ url('mozorg.impact-report.index') }}" data-link-text="Impact" data-link-type="nav" data-link-position="topnav" data-link-group="who-we-are">
<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg" class="c-menu-item-icon"><g transform="translate(4 1)" fill="none"><path d="M.4 14.7 4 12v7l-2.4 1.8A1 1 0 0 1 0 20v-4.5a1 1 0 0 1 .4-.8zM15.6 14.7 12 12v7l2.4 1.8A1 1 0 0 0 16 20v-4.5a1 1 0 0 0-.4-.8z" stroke="#42435a" stroke-width="2"/><path d="M5.137 4.14 7.127.569a1 1 0 0 1 1.747 0l1.989 3.57A9 9 0 0 1 12 8.52V19.02H4V8.52a9 9 0 0 1 1.137-4.38z" stroke="#42435a" stroke-width="2"/><circle cx="8" cy="8" r="1.5" fill="#42435a"/><path d="M7.95 16v6" stroke="#42435a" stroke-linecap="round" stroke-width="2"/></g></svg>
<h4 class="c-menu-item-title">{{ ftl('navigation-v2-impact') }}</h4>
<p class="c-menu-item-desc">{{ ftl('navigation-v2-find-out-how') }}</p>
</a>
</section>
</li>
{% endif %}

</ul>
<p class="c-menu-category-link">
<a href="{{ url('mozorg.about.index') }}" data-link-text="More About Mozilla" data-link-type="nav" data-link-position="topnav" data-link-group="who-we-are">{{ ftl('navigation-v2-more-about-mozilla') }}</a>
Expand Down
2 changes: 1 addition & 1 deletion bedrock/careers/templates/careers/diversity.html
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
media_after=False
) %}
<h1>Inclusion, diversity, equity, and accountability</h1>
<p><a href="{{ url('mozorg.diversity.2022.index') }}" class="mzp-c-button">View our 2022 D&I Report</a></p>
<p><a href="{{ url('mozorg.impact-report.index') }}" class="mzp-c-button">View our latest Impact Report</a></p>
{% endcall %}
</div>
</header>
Expand Down
133 changes: 133 additions & 0 deletions bedrock/mozorg/templates/mozorg/impact-report/index.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,133 @@
{#
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 https://mozilla.org/MPL/2.0/.
#}

{% extends "base-protocol-mozilla.html" %}

{% from "macros-protocol.html" import split, picto, card with context %}

{% block page_title %}Social and Environmental Impact{% endblock %}
{% block page_desc %}Mozilla supports making the internet more equitable, inclusive, and sustainable.{% endblock %}

{% block page_css %}
{{ css_bundle('protocol-split') }}
{{ css_bundle('protocol-card') }}
{{ css_bundle('impact') }}
{% endblock %}

{% block content %}
<main>
<header>
<div class="c-hero-banner mzp-l-content">

<h1>
<span>Our social</span>
<span>&</span> <br>
<span>environmental</span> <br> <span>impact</span>
</h1>

</div>
<div class="c-subheader mzp-l-content">
<h2>Learn how Mozilla is making the internet more equitable, inclusive, and sustainable</h2>
</div>

</header>

<section class="c-report">
{% call split(
block_class='mzp-l-split-center-on-sm-md mzp-l-split-reversed c-foundation',
image=resp_img(
url='img/mozorg/impact/report-cover.jpg',
srcset={
'img/mozorg/impact/report-cover-high-res.jpg': '2x'
},
optional_attributes={
'class': 'mzp-c-split-media-asset',
'loading': 'lazy'
}
),
media_after=False
) %}
<h3>Our 2024 report</h3>
<p>This holistic report by the Mozilla Corporation and Mozilla Foundation provides transparency to our employees, customers, and community on the progress of our Sustainability and Diversity, Equity, Inclusion, and Belonging commitments in 2023.</p>
<a href="" class="mzp-c-button">View the report</a>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Waiting for this PDF.

{% endcall %}
</section>

<section class="c-cards mzp-l-content">
<h3>Join us in making an impact!</h3>
<div class="mzp-l-card-quarter">

{{ card(
title='Help the planet',
ga_title='Help the planet',
image=resp_img('img/mozorg/impact/green-planet.jpg', optional_attributes={"loading": "lazy", "class": "mzp-c-card-image"}),
desc='Ways each of us can protect and preserve Earth',
link_url='https://getpocket.com/collections/how-to-help-the-planet-environment'
)}}

{{ card(
title='Fight anti-Black racism',
ga_title='Fight anti-Black racism',
image=resp_img('img/mozorg/impact/fight-racism.jpg', optional_attributes={"loading": "lazy", "class": "mzp-c-card-image"}),
desc='A resource list compiled by Afrozilla',
link_url='https://getpocket.com/collections/moving-from-ally-to-accomplice-in-the-anti-racist-fight-an-afrozilla-resource-list'
)}}

{{ card(
title='Make your website more accessible',
ga_title='Make your website more accessible',
image=resp_img('img/mozorg/impact/moz-a11y.jpg', optional_attributes={"loading": "lazy", "class": "mzp-c-card-image"}),
desc='Tips, hints, and guidelines',
link_url='https://developer.mozilla.org/en-US/blog/accessibility-celebrating-gaad-2023/'
)}}

{{ card(
title='Become a Fellow',
ga_title='Become a Fellow',
image=resp_img('img/mozorg/impact/mofo-fellows.jpg', optional_attributes={"loading": "lazy", "class": "mzp-c-card-image"}),
desc='Address challenges facing a healthy internet',
link_url='https://foundation.mozilla.org/en/what-we-fund/fellowships/'
)}}
</div>
</section>

<section class="c-past-reports mzp-l-content">
<h3>Explore our past reports</h3>
<table class="mzp-u-data-table c-past-reports-table">
<thead>
<tr>
<th>Diversity & Inclusion</th>
<th>Sustainability</th>
</tr>
</thead>
<tbody>
<tr>
<td><a href="{{ url('mozorg.diversity.2022.index') }}">2023 Diversity & Inclusion Report</a></td>
<td><a href="{{ url('mozorg.sustainability.index') }}">2023 Sustainability Report</a> (2020-2022 data)</td>
</tr>
<tr>
<td><a href="{{ url('mozorg.diversity.2021.index') }}">2022 Diversity & Inclusion Report</a></td>
<td><a href="https://blog.mozilla.org/en/mozilla/release-mozillas-greenhouse-gas-emissions-baseline/">Blog: Mozilla’s 2019 Greenhouse Gas Emissions</a></td>
</tr>
<tr>
<td><a href="https://foundation.mozilla.org/en/blog/mozilla-foundation-2020-diversity-disclosure/">2020 Mozilla Foundation D&I Report</a></td>
<td><a href="https://blog.mozilla.org/wp-content/blogs.dir/278/files/2021/02/Mozillas-2019-Greenhouse-Gas-emissions-baseline_2020-11-18.pdf">Detailed 2019 Greenhouse Gas Emissions Inventory</a></td>
</tr>
<tr>
<td><a href="https://blog.mozilla.org/careers/mozilla-diversity-inclusion-2019-results/">2020 Mozilla Corporation D&I Report</a></td>
</tr>
<tr>
<td><a href="https://blog.mozilla.org/careers/mozilla-diversity-inclusion-2018-results/">2019 Mozilla Corporation D&I Report</a></td></tr>
<tr>
<td><a href="https://blog.mozilla.org/careers/diversity-and-inclusion-at-mozilla/">2018 Mozilla Corporation D&I Report</a></td></tr>
<tr>
<td><a href="https://blog.mozilla.org/careers/diversity-and-inclusion-at-mozilla-foundation/">2018 Mozilla Foundation D&I Report</a></td></tr>
</tbody>
</table>
</section>

</main>
{% endblock %}
2 changes: 2 additions & 0 deletions bedrock/mozorg/urls.py
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,8 @@
page("sustainability/", "mozorg/sustainability/index.html"),
page("sustainability/carbon-neutral/", "mozorg/sustainability/carbon-neutral.html"),
page("sustainability/emissions-data/", "mozorg/sustainability/emissions-data.html"),
# SEI page
page("impact/", "mozorg/impact-report/index.html"),
# Webvision
# there's also a redirect in mozorg.nonlocale_urls
path(
Expand Down
2 changes: 2 additions & 0 deletions l10n/en/navigation_v2.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,8 @@ navigation-v2-work-for-a-mission-driven-updated = Work for a mission-driven orga
navigation-v2-mozilla-blog = { -brand-name-mozilla } Blog
navigation-v2-learn-about-mozilla-and = Learn about { -brand-name-mozilla } and the issues that matter to us.
navigation-v2-more-about-mozilla = More About { -brand-name-mozilla }
navigation-v2-impact = Impact
navigation-v2-find-out-how = Find out how we’re making the internet more inclusive and sustainable

## Innovation menu

Expand Down
4 changes: 2 additions & 2 deletions media/css/firefox/installer-help.scss
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,13 @@ $image-path: '/media/protocol/img';
}

.installer-channel-card {
margin: 0 auto $spacing-2xl auto;
margin: 0 auto $spacing-2xl;
float: none;
text-align: center;
}

.install-help {
margin: 0 auto $spacing-2xl auto;
margin: 0 auto $spacing-2xl;
max-width: $content-xs;
text-align: center;

Expand Down
2 changes: 1 addition & 1 deletion media/css/firefox/releasenotes.scss
Original file line number Diff line number Diff line change
Expand Up @@ -448,7 +448,7 @@ $image-path: '/media/protocol/img';
color: $color-marketing-gray-60;
cursor: pointer;
font-weight: bold;
padding: 0 0 $spacing-xs 0;
padding: 0 0 $spacing-xs;
position: static;

&::before {
Expand Down
2 changes: 1 addition & 1 deletion media/css/firefox/switch.scss
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ $image-path: '/media/protocol/img';
font-weight: bold;
height: 1.7em;
justify-content: center;
margin: 0 auto $spacing-md auto;
margin: 0 auto $spacing-md;
width: 1.7em;
}

Expand Down
110 changes: 110 additions & 0 deletions media/css/mozorg/impact.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,110 @@
// 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 https://mozilla.org/MPL/2.0/.

$font-path: '/media/protocol/fonts';
$image-path: '/media/protocol/img';

@import '~@mozilla-protocol/core/protocol/css/includes/lib';

header {
background-color: $color-black;
text-align: center;

.c-hero-banner {
min-height: 250px;
background-color: $color-black;
display: flex;
flex-direction: column;
justify-content: center;
align-items: center;

h1 {
reemhamz marked this conversation as resolved.
Show resolved Hide resolved
@include font-base;
@include text-title-lg;
color: $color-white;
font-weight: normal;

span {
background: $color-green-70;
}
}

@media #{$mq-md} {
background-image: url('/media/img/mozorg/impact/arrow.png');
background-size: 900px;
background-position: center center;
background-repeat: no-repeat;
min-height: 450px;

h1 {
@include font-size(90px);

span {
display: inline-block;
margin-bottom: $spacing-md;
padding: 0 $spacing-md;

&:nth-of-type(1) {
margin-left: -160px;
}

&:nth-of-type(3) {
margin-left: 90px;
}
}
}
}

@media #{$mq-lg} {
@include background-size(1300px, auto);
}
}

.c-subheader {
padding-bottom: $spacing-md;
padding-top: 0;

h2 {
@include text-title-xs;
@include font-base;
color: $color-white;
font-weight: 500;
}
}
}

.c-foundation {
padding-bottom: 0;
}

.c-cards {
h3 {
text-align: center;
}
}

.c-past-reports {
padding-top: 0;

h3 {
text-align: center;
}
}


.c-past-reports-table {
margin: 0 auto;
margin-top: $spacing-2xl;
table-layout: auto;

th,
td {
max-width: 420px;
}

@media #{$mq-md} {
table-layout: fixed;
width: 790px;
}
}
2 changes: 1 addition & 1 deletion media/css/pocket/includes/_platform-footer.scss
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ $image-path: '/media/protocol/img';
max-width: 100%;

.footer-navigation-list-item {
margin: 0 $spacing-sm 0;
margin: 0 $spacing-sm;
}
}

Expand Down
2 changes: 1 addition & 1 deletion media/css/products/vpn/components/pricing-plus-relay.scss
Original file line number Diff line number Diff line change
Expand Up @@ -193,7 +193,7 @@ $image-path: '/media/protocol/img';
));

.vpn-pricing-variable-saving {
margin: 0 0 $spacing-sm 0;
margin: 0 0 $spacing-sm;
}
}

Expand Down
2 changes: 1 addition & 1 deletion media/css/products/vpn/landing.scss
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ html {
// Waitlist Feature Block

.vpn-waitlist-feature-block {
margin: 0 0 $layout-xl 0;
reemhamz marked this conversation as resolved.
Show resolved Hide resolved
margin: 0 0 $layout-xl;
text-align: center;

.vpn-feature-list.mzp-u-list-styled {
Expand Down
Binary file added media/img/mozorg/impact/arrow.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added media/img/mozorg/impact/fight-racism.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added media/img/mozorg/impact/green-planet.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added media/img/mozorg/impact/mofo-fellows.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added media/img/mozorg/impact/moz-a11y.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added media/img/mozorg/impact/report-cover.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 6 additions & 0 deletions media/static-bundles.json
Original file line number Diff line number Diff line change
Expand Up @@ -1193,6 +1193,12 @@
],
"name": "sustainability"
},
{
"files": [
"css/mozorg/impact.scss"
],
"name": "impact"
},
{
"files": [
"css/mozorg/advertising.scss"
Expand Down