-
Notifications
You must be signed in to change notification settings - Fork 918
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Seperate components of "hero" (#15510)
- seperate about "hero" into 3 components (intro, feature, pictos) - add alt white and black backgrounds - move images from m24/about folder to mozorg/about/m24 - optimize community and manifesto images
- Loading branch information
1 parent
618d5c2
commit 0f4d04e
Showing
19 changed files
with
228 additions
and
227 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
101 changes: 0 additions & 101 deletions
101
bedrock/mozorg/templates/mozorg/about/includes/m24/hero.html
This file was deleted.
Oops, something went wrong.
14 changes: 14 additions & 0 deletions
14
bedrock/mozorg/templates/mozorg/about/includes/m24/intro.html
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,14 @@ | ||
{# | ||
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/. | ||
#} | ||
|
||
{% from "macros-protocol.html" import picto with context %} | ||
|
||
<div class="m24-c-content"> | ||
<div class="m24-c-intro m24-t-intro-snug"> | ||
<h1 class="m24-c-intro-title m24-t-2xl">Reclaim the internet with us</h1> | ||
<p>Mozilla is working to put control of the internet back in the hands of the people using it.</p> | ||
</div> | ||
</div> |
98 changes: 98 additions & 0 deletions
98
bedrock/mozorg/templates/mozorg/about/includes/m24/manifesto.html
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,98 @@ | ||
{# | ||
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/. | ||
#} | ||
|
||
{% from "macros-protocol.html" import picto with context %} | ||
|
||
<div class="m24-t-light-alt m24-t-dark"> | ||
<div class="m24-c-feature"> | ||
<div class="m24-c-feature-media"> | ||
{{ resp_img( | ||
url='img/mozorg/about/m24/manifesto-27-1.jpg', | ||
srcset={ | ||
'img/mozorg/about/m24/manifesto-27-1-high-res.jpg': '2x' | ||
}, | ||
optional_attributes={ | ||
'width': '1440', | ||
'height': '682' | ||
} | ||
) }} | ||
</div> | ||
<div class="m24-c-feature-text"> | ||
<h2 class="m24-c-feature-title">Together, we can keep the internet easy, safe and free, for everyone</h2> | ||
<p class="m24-c-feature-cta"><a href="{{ url('mozorg.about.manifesto') }}" class="m24-c-cta" data-cta-text="Manifesto">Read our manifesto</a></p> | ||
</div> | ||
</div> | ||
</div> | ||
|
||
<div class="m24-t-light-alt"> | ||
<div class="m24-c-content"> | ||
<ul class="m24-t-columns-four"> | ||
{% call picto( | ||
base_el='li', | ||
image=resp_img( | ||
url='img/icons/m24-small/icon-bell.svg', | ||
optional_attributes={ | ||
'class': 'mzp-c-picto-image', | ||
'loading': 'lazy' | ||
} | ||
), | ||
body=True, | ||
heading_level=3, | ||
title="Advocate" | ||
) %} | ||
<p>We advocate for better products, holding governments and tech corporations accountable for what they create.</p> | ||
{% endcall %} | ||
|
||
{% call picto( | ||
base_el='li', | ||
image=resp_img( | ||
url='img/icons/m24-small/icon-glasses.svg', | ||
optional_attributes={ | ||
'class': 'mzp-c-picto-image', | ||
'loading': 'lazy' | ||
} | ||
), | ||
body=True, | ||
heading_level=3, | ||
title="Monitor" | ||
) %} | ||
<p>We monitor developments, conduct research, and campaign to improve products and drive policies that will represent your interests.</p> | ||
{% endcall %} | ||
|
||
{% call picto( | ||
base_el='li', | ||
image=resp_img( | ||
url='img/icons/m24-small/icon-pencil.svg', | ||
optional_attributes={ | ||
'class': 'mzp-c-picto-image', | ||
'loading': 'lazy' | ||
} | ||
), | ||
body=True, | ||
heading_level=3, | ||
title="Build" | ||
) %} | ||
<p>We build products that put you in control — like Firefox, Fakespot and more.</p> | ||
{% endcall %} | ||
|
||
{% call picto( | ||
base_el='li', | ||
image=resp_img( | ||
url='img/icons/m24-small/icon-dollar.svg', | ||
optional_attributes={ | ||
'class': 'mzp-c-picto-image', | ||
'loading': 'lazy' | ||
} | ||
), | ||
body=True, | ||
heading_level=3, | ||
title="Fund" | ||
) %} | ||
<p>We fund and invest in the people and efforts taking technology, the internet, and AI in the right direction.</p> | ||
{% endcall %} | ||
</ul> | ||
</div> | ||
</div> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,93 @@ | ||
// 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/. | ||
|
||
|
||
// feature | ||
.m24-c-feature { | ||
@include container; | ||
padding-bottom: $spacer-xl; | ||
} | ||
|
||
.m24-c-feature-media { | ||
padding-top: $container-padding; | ||
padding-bottom: $spacer-xl; | ||
} | ||
|
||
.m24-c-feature-title { | ||
margin-bottom: $spacer-xl; | ||
font-size: $alias-text-title-h2; | ||
line-height: 1; | ||
text-wrap: balance; | ||
text-wrap-style: balance; | ||
} | ||
|
||
.m24-c-feature-cta { | ||
text-align: end; | ||
} | ||
|
||
@media #{$mq-xl} { | ||
.m24-c-feature-title { | ||
max-width: grid(9); | ||
} | ||
} | ||
|
||
// columns | ||
|
||
.m24-t-columns-four { | ||
align-items: flex-start; | ||
gap: $spacer-md $grid-gutter; | ||
display: flex; | ||
flex-direction: column; | ||
justify-content: space-between; | ||
margin-bottom: 0; | ||
|
||
@media #{$mq-lg} { | ||
flex-flow: row wrap; | ||
} | ||
|
||
@media #{$mq-xl} { | ||
flex-flow: row nowrap; | ||
} | ||
} | ||
|
||
// picto | ||
|
||
.mzp-c-picto { | ||
font-size: $text-body-md; | ||
line-height: 1.2; | ||
margin-bottom: 0; | ||
text-wrap: balance; | ||
text-wrap-style: balance; | ||
|
||
.mzp-c-picto-image { | ||
height: 48px; | ||
width: 48px; | ||
} | ||
|
||
p { | ||
margin-bottom: 0; | ||
} | ||
} | ||
|
||
.mzp-c-picto-heading { | ||
font-size: $text-title-md; | ||
} | ||
|
||
@media #{$mq-md} { | ||
.mzp-c-picto-image { | ||
margin-bottom: $spacer-sm; | ||
} | ||
} | ||
|
||
@media #{$mq-lg} { | ||
.mzp-c-picto { | ||
max-width: grid(6); | ||
} | ||
} | ||
|
||
@media #{$mq-xl} { | ||
.mzp-c-picto { | ||
max-width: grid(3); | ||
} | ||
} |
Oops, something went wrong.