-
Notifications
You must be signed in to change notification settings - Fork 153
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
PNI Consumer Creep-O-Meter Page Hero #11146
Merged
Merged
Changes from 16 commits
Commits
Show all changes
18 commits
Select commit
Hold shift + click to select a range
719ac4c
Get general section structure in
mmmavis 6ff6523
add content to hero section
mmmavis 68457e8
cleaner implementation for creep-o-meter and emoji
mmmavis 33b9f5c
add missing assets
mmmavis 11e63e3
ran SVGO on assets
mmmavis a88939c
cleaned up some code
mmmavis 048ef6d
add speech bubble stem
mmmavis ee1fa4d
fix linting
mmmavis 52f0cbc
tweaks
mmmavis 667ea83
Merge branch 'feature-pni-privacy-index-2023' into 11094-pni-hero
mmmavis d36b9dd
styling tweaks to address PR feedback
mmmavis 9b958ac
Merge branch 'feature-pni-privacy-index-2023' into 11094-pni-hero
mmmavis ab63dbe
Merge branch 'feature-pni-privacy-index-2023' into 11094-pni-hero
mmmavis 3fcb990
Merge branch '11094-pni-hero' of https://github.com/mozilla/foundatio…
mmmavis 4b3e990
fix linting
mmmavis 6a610d6
move creep-o-meter up so it's closer to the speech bubble
mmmavis 935600c
tweaks
mmmavis d557d03
more tweaks
mmmavis File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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
117 changes: 113 additions & 4 deletions
117
network-api/networkapi/templates/buyersguide/pages/consumer_creepometer_page_2023.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 |
---|---|---|
@@ -1,8 +1,117 @@ | ||
<div class="tw-container tw-mt-24"> | ||
{% load static %} | ||
|
||
{% with wrapper_class="tw-py-[120px] tw-h-[1000px]" h1_class="tw-text-[48px] tw-leading-[56px] tw-font-semibold tw-font-zilla" h2_class="tw-font-light tw-font-zilla tw-text-[40px] tw-leading-[48px]" h3_class="tw-text-[24px] tw-leading-[28px] medium:tw-text-[28px] medium:tw-leading-[36px]" fixme_class="tw-text-red-80 tw-bg-red-10" body_large_class="tw-text-[20px] tw-leading-[30px]" %} | ||
{% comment %} Hero Section {% endcomment %} | ||
<div class="tw-relative"> | ||
<div class="tw-container tw-relative tw-pt-40 medium:tw-pt-0 tw-mt-[15px] medium:tw-mt-[60px]"> | ||
<div class="tw-absolute tw-top-0 medium:tw-bottom-0 medium:tw-left-0 medium:tw-right-0 tw-right-4 tw-w-[83px] tw-h-[79px] medium:tw-w-auto medium:tw-h-auto"> | ||
<div class="tw-relative medium:tw-left-[82.5%]"> | ||
<img width="383" height="367" alt="" src="{% static "_images/buyers-guide/consumer-creepometer/hero-face-1.svg" %}" /> | ||
</div> | ||
</div> | ||
<div class="tw-row tw-px-8 tw-mt-4 medium:tw-mt-0"> | ||
<div class="tw-w-full medium:tw-w-[82.5%]"> | ||
<h1 class="tw-font-normal tw-font-zilla tw-text-[48px] tw-leading-[44px] medium:tw-text-[80px] medium:tw-leading-none tw-mb-12 medium:tw-mb-24">Welcome to <span class="tw-font-semibold">Mozilla’s</span> first-ever <strong class="tw-font-semibold">Annual Consumer Creep-O-Meter</strong></h1> | ||
<p class="tw-font-light tw-font-zilla tw-text-[24px] tw-leading-[28px] medium:tw-text-[40px] medium:tw-leading-[48px]"> | ||
In 2023, the state of our digital privacy is <strong class="tw-relative tw-block tw-text-center tw-font-sans tw-font-[28px] tw-leading-[32px] medium:tw-text-[80px] medium:tw-leading-none tw-font-extrabold tw-max-w-[75%] tw-my-12 medium:tw-my-24 tw-px-12 medium:tw-px-[100px] tw-py-6 medium:tw-py-12 tw-bg-blue-05 tw-rounded-lg medium:tw-rounded-3xl after:tw-content-[''] after:tw-w-[calc(94px/2)] after:tw-h-[calc(57px/2)] medium:after:tw-w-[94px] medium:after:tw-h-[57px] after:tw-absolute after:tw-top-[calc(100%-2px)] after:tw-right-0 after:tw-bg-center after:tw-bg-no-repeat after:tw-bg-cover after:tw-bg-[url('../_images/buyers-guide/consumer-creepometer/bubble-stem.svg')]">Very creepy</strong> | ||
</p> | ||
</div> | ||
</div> | ||
</div> | ||
<div class="tw-relative tw-flex tw-justify-center -tw-mt-4 medium:-tw-mt-10 large:-tw-mt-28" aria-hidden="true"> | ||
{% with face_container_class="tw-h-[120px] tw-w-[125px] medium:tw-h-[270px] medium:tw-w-[270px] tw-ml-auto tw-mr-[5%] medium:tw-mr-[10%]" %} | ||
<div class="tw-absolute tw-transform tw-top-1/2 -tw-translate-y-1/2 tw-h-8 medium:tw-h-12 tw-w-full tw-bg-gradient-to-r tw-from-[#0000FF] tw-to-[#FF506E] tw-bg-gradient-to-b tw-shadow-[0_0_80px_30px_theme('colors.purple.05')]"> | ||
</div> | ||
<div class="tw-container"> | ||
<div class="{{ face_container_class }}"> | ||
<img class="tw-relative tw-z-[2]" width="100%" height="100%" alt="" src="{% static "_images/buyers-guide/consumer-creepometer/hero-face-2.svg" %}" /> | ||
<div class="tw-z-[-1] {{ face_container_class }} tw-absolute tw-transform tw-top-1/2 tw-translate-x-[5px] -tw-translate-y-[calc(50%-8px)] tw-scale-[85%] tw-rounded-full tw-bg-gray-20"></div> | ||
</div> | ||
</div> | ||
{% endwith %} | ||
</div> | ||
<div class="tw-container tw-pt-12 medium:tw-pt-[60px] tw-pb-[60px] medium:tw-pb-[120px]"> | ||
<div class="tw-row tw-justify-end tw-px-8"> | ||
<div class="tw-w-full medium:tw-w-2/3"> | ||
<p class="tw-text-[18px] tw-leading-[27px] medium:tw-text-[28px] medium:tw-leading-[36px] tw-mb-0">In numbers, that translates to 75.6/100, with 100 being the most creepy. Our annual benchmark measures the current state of digital privacy — and what direction it’s trending.</p> | ||
</div> | ||
</div> | ||
</div> | ||
</div> | ||
|
||
{% comment %} Quiz Section {% endcomment %} | ||
<div class="{{ wrapper_class }} tw-bg-[#F4F4F4]"> | ||
<div class="tw-container"> | ||
<div class="tw-row tw-px-8"> | ||
<div class="tw-w-full"> | ||
<h2>Quiz Section</h2> | ||
</div> | ||
</div> | ||
</div> | ||
</div> | ||
|
||
{% comment %} Sub Nav Section {% endcomment %} | ||
<div class="{{ wrapper_class }}"> | ||
<div class="tw-container"> | ||
<div class="tw-row tw-px-8"> | ||
<div class="tw-w-full"> | ||
<h2>Sub Nav Section</h2> | ||
</div> | ||
</div> | ||
</div> | ||
</div> | ||
|
||
{% comment %} Big Picture Trends Section {% endcomment %} | ||
<div class="{{ wrapper_class }} tw-bg-gradient-to-b tw-from-white tw-via-yellow-05 tw-to-white"> | ||
<div class="tw-container"> | ||
<div class="tw-row tw-px-8"> | ||
<div class="tw-w-full"> | ||
<h2>Big Picture Trends Section</h2> | ||
</div> | ||
</div> | ||
</div> | ||
</div> | ||
|
||
{% comment %} Best & Worst Products Section {% endcomment %} | ||
<div class="{{ wrapper_class }} tw-bg-gradient-to-b tw-from-white tw-via-red-05 tw-to-white"> | ||
<div class="tw-container"> | ||
<div class="tw-row tw-px-8"> | ||
<div class="tw-w-full"> | ||
<h2>Best & Worst Products Section</h2> | ||
</div> | ||
</div> | ||
</div> | ||
</div> | ||
|
||
{% comment %} By The Numbers Section {% endcomment %} | ||
<div class="tw-h-[1000px] {{ wrapper_class }} tw-bg-gradient-to-b tw-from-white tw-via-blue-10 tw-to-white"> | ||
<div class="tw-container"> | ||
<div class="tw-row tw-px-8"> | ||
<div class="tw-w-full"> | ||
<h2>By The Numbers Section</h2> | ||
</div> | ||
</div> | ||
</div> | ||
</div> | ||
|
||
{% comment %} Stay in Control Section {% endcomment %} | ||
<div class="tw-h-[1000px] {{ wrapper_class }} tw-container"> | ||
<div class="tw-row tw-px-8"> | ||
<div class="tw-w-full"> | ||
<h2>Stay in Control Section</h2> | ||
</div> | ||
</div> | ||
</div> | ||
|
||
{% comment %} Outro Section {% endcomment %} | ||
<div class="{{ wrapper_class }} tw-bg-gradient-to-b tw-from-white tw-to-blue-10"> | ||
<div class="tw-container"> | ||
<div class="tw-row tw-px-8"> | ||
<div class="tw-w-full"> | ||
<h1>Page Title: {{ page.title }}</h1> | ||
<h2>Year: {{ page.year }}</h2> | ||
<h2>Outro Section</h2> | ||
</div> | ||
</div> | ||
</div> | ||
</div> | ||
</div> | ||
|
||
{% endwith %} |
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
58 changes: 46 additions & 12 deletions
58
network-api/networkapi/wagtailpages/migrations/0105_consumercreepometerpage.py
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 |
---|---|---|
@@ -1,30 +1,64 @@ | ||
# Generated by Django 3.2.21 on 2023-09-22 17:40 | ||
|
||
from django.db import migrations, models | ||
import django.db.models.deletion | ||
import networkapi.wagtailpages.pagemodels.mixin.foundation_navigation | ||
import wagtailmetadata.models | ||
from django.db import migrations, models | ||
|
||
import networkapi.wagtailpages.pagemodels.mixin.foundation_navigation | ||
|
||
class Migration(migrations.Migration): | ||
|
||
class Migration(migrations.Migration): | ||
dependencies = [ | ||
('wagtailimages', '0024_index_image_file_hash'), | ||
('wagtailcore', '0078_referenceindex'), | ||
('wagtailpages', '0104_delete_redirectingpage_model'), | ||
("wagtailimages", "0024_index_image_file_hash"), | ||
("wagtailcore", "0078_referenceindex"), | ||
("wagtailpages", "0104_delete_redirectingpage_model"), | ||
] | ||
|
||
operations = [ | ||
migrations.CreateModel( | ||
name='ConsumerCreepometerPage', | ||
name="ConsumerCreepometerPage", | ||
fields=[ | ||
('page_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='wagtailcore.page')), | ||
('year', models.CharField(choices=[('2023', '2023')], default='2023', help_text='Which year is this page for?', max_length=4)), | ||
('search_image', models.ForeignKey(blank=True, help_text='Image must be high quality, include our logo mark and have the dimensions 1200 x 628 px. For more design guidelines see here: https://foundation.mozilla.org/en/docs/brand/brand-identity/social-media/#og-images', null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to='wagtailimages.image', verbose_name='Search image')), | ||
( | ||
"page_ptr", | ||
models.OneToOneField( | ||
auto_created=True, | ||
on_delete=django.db.models.deletion.CASCADE, | ||
parent_link=True, | ||
primary_key=True, | ||
serialize=False, | ||
to="wagtailcore.page", | ||
), | ||
), | ||
( | ||
"year", | ||
models.CharField( | ||
choices=[("2023", "2023")], | ||
default="2023", | ||
help_text="Which year is this page for?", | ||
max_length=4, | ||
), | ||
), | ||
( | ||
"search_image", | ||
models.ForeignKey( | ||
blank=True, | ||
help_text="Image must be high quality, include our logo mark and have the dimensions 1200 x 628 px. For more design guidelines see here: https://foundation.mozilla.org/en/docs/brand/brand-identity/social-media/#og-images", | ||
null=True, | ||
on_delete=django.db.models.deletion.SET_NULL, | ||
related_name="+", | ||
to="wagtailimages.image", | ||
verbose_name="Search image", | ||
), | ||
), | ||
], | ||
options={ | ||
'abstract': False, | ||
"abstract": False, | ||
}, | ||
bases=(wagtailmetadata.models.WagtailImageMetadataMixin, networkapi.wagtailpages.pagemodels.mixin.foundation_navigation.FoundationNavigationPageMixin, 'wagtailcore.page', models.Model), | ||
bases=( | ||
wagtailmetadata.models.WagtailImageMetadataMixin, | ||
networkapi.wagtailpages.pagemodels.mixin.foundation_navigation.FoundationNavigationPageMixin, | ||
"wagtailcore.page", | ||
models.Model, | ||
), | ||
), | ||
] |
1 change: 1 addition & 0 deletions
1
source/images/buyers-guide/consumer-creepometer/bubble-stem.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions
1
source/images/buyers-guide/consumer-creepometer/hero-face-1.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions
1
source/images/buyers-guide/consumer-creepometer/hero-face-2.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
linting fixes