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

Type cleanup & standardization work #2810

Merged
merged 28 commits into from
Mar 25, 2019
Merged
Show file tree
Hide file tree
Changes from 22 commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
a43aae2
(WIP) type cleanup work
mmmavis Mar 14, 2019
a669460
more changes
mmmavis Mar 14, 2019
833f6cc
updated 'body' and 'quote' related SCSS
mmmavis Mar 14, 2019
c373e5e
updated styleguide
mmmavis Mar 14, 2019
8c4c5bb
updated styleguide
mmmavis Mar 14, 2019
8fc703f
updated styleguide
mmmavis Mar 14, 2019
300d697
updated styleguide
mmmavis Mar 14, 2019
43f6a50
added dark theme related styling
mmmavis Mar 14, 2019
f49f2d9
updated .h2-heading classname
mmmavis Mar 14, 2019
962aace
updated .h3-heading classname
mmmavis Mar 14, 2019
7c9f308
updated .h4-heading classname
mmmavis Mar 14, 2019
8460595
updated .cta-link styling
mmmavis Mar 14, 2019
a65cc39
fixed merge conflicts
mmmavis Mar 14, 2019
1fc2bac
removed redundant SCSS
mmmavis Mar 15, 2019
e28c4c2
Merge branch 'master' into issue-2806-style-type
mmmavis Mar 15, 2019
3713389
fixed merge conflicts
mmmavis Mar 18, 2019
4bc5afc
Merge branch 'master' into issue-2806-style-type
mmmavis Mar 18, 2019
08f9b81
removed commented out SCSS code
mmmavis Mar 18, 2019
800ae6c
updated stylings
mmmavis Mar 19, 2019
69a4bb2
styling fix for .commitment
mmmavis Mar 20, 2019
d1cf0f5
Merge branch 'master' into issue-2806-style-type
mmmavis Mar 20, 2019
b87667c
Merge branch 'master' into issue-2806-style-type
mmmavis Mar 20, 2019
d85c505
Merge branch 'master' into issue-2806-style-type
mmmavis Mar 21, 2019
95d92d8
Merge branch 'master' into issue-2806-style-type
mmmavis Mar 22, 2019
ca33d62
fixed merge conflict
mmmavis Mar 22, 2019
d8f637c
Merge branch 'issue-2806-style-type' of https://github.com/mozilla/fo…
mmmavis Mar 22, 2019
a494391
fixed merge conflict
mmmavis Mar 22, 2019
0967edb
Merge branch 'master' into issue-2806-style-type
mmmavis Mar 25, 2019
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="col-12 col-md-12 col-lg-8 mt-5 mb-5 justify-content-center short-content">

<h1 class="h3-heading">
<h1 class="h2-heading">
Contact Us
</h1>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,15 @@

<div class="col-12 col-md-12 col-lg-8 mt-5 justify-content-center">

<h1 class="h3-heading">
<h1 class="h2-heading">
How to Use This Guide
</h1>

<p>
Need help understanding how to use this guide? Here you go:
</p>

<h2 class="h4-heading">
<h2 class="h3-heading">
Creep-O-Meter
</h2>
<p>
Expand All @@ -26,14 +26,14 @@ <h2 class="h4-heading">
up to others.
</p>

<h2 class="h4-heading">
<h2 class="h3-heading">
Our Minimum Security Standards
</h2>
<p>
We developed a set of minimum security standards we think all connected products should meet at the very least. Think of it as a “you must be this tall to ride” set of standards. These include five basic things: The product must use encryption, the company must provide automatic security updates, if a product uses a password, it must require a strong password, the company must have a way to manage security vulnerabilities found in their products, and the company must have an accessible privacy policy. In the guide, we've ticked the products that from our research appear to meet the guidelines. This tick is not an endorsement of the product on behalf of Mozilla, Consumers International or the Internet Society. If you would like to learn more about our minimum security standards go <a href="https://medium.com/read-write-participate/minimum-standards-for-tackling-iot-security-70f90b37f2d5">here</a>.
</p>

<h2 class="h4-heading">
<h2 class="h3-heading">
Criteria
</h2>

Expand Down Expand Up @@ -181,15 +181,15 @@ <h2 class="h5-heading">
</label>
</div>

<h2 class="h4-heading">
<h2 class="h3-heading">
Updates
</h2>
<p>
When news breaks or we come across a relevant article about a product in this guide, we will share it in the
updates section on each product page.
</p>

<h2 class="h4-heading">
<h2 class="h3-heading">
Comments
</h2>
<p>
Expand All @@ -198,7 +198,7 @@ <h2 class="h4-heading">
in the comment section at the bottom of each product page.
</p>

<h2 class="h4-heading">
<h2 class="h3-heading">
Methodology
</h2>
<p>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

<div class="col-12 col-md-12 col-lg-8 mt-5 justify-content-center">

<h1 class="h3-heading">
<h1 class="h2-heading">
Why We Made This Guide
</h1>

Expand All @@ -31,7 +31,7 @@ <h1 class="h3-heading">
look like?
</p>

<h2 class="h4-heading">
<h2 class="h3-heading">
This guide is more opinionated.
</h2>
<p>
Expand All @@ -44,7 +44,7 @@ <h2 class="h4-heading">
guide.

</p>
<h2 class="h4-heading">
<h2 class="h3-heading">
There is a Creep-O-Meter.
</h2>
<p>
Expand All @@ -53,7 +53,7 @@ <h2 class="h4-heading">
created our Creep-O-Meter—a users rating on each product—to let folks give their opinion too. Try it out, it’s
fun.
</p>
<h2 class="h4-heading">
<h2 class="h3-heading">
Bigger and better.
</h2>
<p>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ <h1 class="h1-heading text-center mt-4">Be Smart. Shop Safe.</h1>
<img class="product-thumbnail" src="{{mediaUrl}}{{"AWS_LOCATION"|env}}/{{product.image }}" alt="link to {{product.name}}">
{% endif %}
<figcaption class="hidden-sm-down mt-md-2 text-left">
<div class="h6-heading">{{product.company}}</div>
<div class="body-small">{{product.company}}</div>
<div class="body">{{product.name}}</div>
</figcaption>
</a>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<div class="row justify-content-center">
<div class="col-12 col-md-8">
<div class="mb-5">
<h1 class="h3-heading">{{ category.name }}</h1>
<h1 class="h2-heading">{{ category.name }}</h1>
{% if category.description != None %}
<p class="body-large mt-4">{{ category.description }}</p>
{% endif %}
Expand All @@ -35,7 +35,7 @@ <h1 class="h3-heading">{{ category.name }}</h1>
<img class="product-thumbnail" src="{{ mediaUrl }}{{ "AWS_LOCATION" | env }}/{{ product.image }}">
{% endif %}
</div>
<h3 class="mb-1 h6-heading">{{ product.company }}</h3>
<h3 class="mb-1 body-small">{{ product.company }}</h3>
<h3 class="mb-5 h5-heading">{{ product.name }}</h3>
</a>
</div>
Expand Down
4 changes: 2 additions & 2 deletions network-api/networkapi/buyersguide/templates/primary_nav.html
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<div class="container text-center">
<div class="row">
<div class="col">
<h3 class="h3-heading">Help us keep the Internet healthy</h3>
<h3 class="h2-heading">Help us keep the Internet healthy</h3>
<p>Mozilla is a nonprofit organization fighting for a healthy interent.</p>
<a class="btn btn-donate m-0 w-100" id="donate-button" href="https://donate.mozilla.org/?utm_source=foundation.mozilla.org&utm_medium=buyersguide&utm_campaign=buyersguide2018&utm_content=headerbutton">Donate</a>
</div>
Expand All @@ -29,7 +29,7 @@ <h3 class="h3-heading">Help us keep the Internet healthy</h3>
<div class="d-flex align-items-center justify-content-between">
<div class="d-flex align-items-center py-3 logo-section">
<a href="/" class="moz-logo mb-0 mr-3"><span class="sr-only">Mozilla</span></a>
<p class="mb-0 h4-heading flex-wrap">
<p class="mb-0 h3-heading flex-wrap">
<a class="link-back" href="/en/privacynotincluded">*privacy not included</a>
</p>
</div>
Expand Down
14 changes: 7 additions & 7 deletions network-api/networkapi/buyersguide/templates/product_page.html
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ <h3 class="h5-heading d-inline-block mb-2 mb-sm-0 mr-3">Our Research</h3>
<a href="/en/privacynotincluded/about" class="info-help">How to use this guide</a>
</div>

<h3 class="h3-heading h3-heading-small">Can it spy on me</h3>
<h3 class="h3-heading">Can it spy on me</h3>

<div class="row mb-5">
<div class="col-12 col-md-4">
Expand Down Expand Up @@ -94,15 +94,15 @@ <h3 class="h3-heading h3-heading-small">Can it spy on me</h3>
</div>
</div>

<h3 class="h3-heading h3-heading-small">What does it know about me</h3>
<h3 class="h3-heading">What does it know about me</h3>

<div class="mb-5">
{% include "fragments/product-criterion.html" with value=product.uses_encryption bad=False help=product.uses_encryption_helptext label="Product uses encryption" criterion_name="uses-encryption" %}
{% include "fragments/product-policy.html" with product=product help=product.privacy_policy_helptext %}
{% include "fragments/product-criterion.html" with value=product.share_data bad=True help=product.share_data_helptext label="Shares your information with 3rd parties for unexpected reasons" %}
</div>

<h3 class="h3-heading h3-heading-small">Can I control it</h3>
<h3 class="h3-heading">Can I control it</h3>

<div class="mb-5">
{% include "fragments/product-criterion.html" with value=product.must_change_default_password bad=False help=product.must_change_default_password_helptext label="If a password is required, you must change the default password" unknown_label="Not required" %}
Expand All @@ -111,14 +111,14 @@ <h3 class="h3-heading h3-heading-small">Can I control it</h3>
{% include "fragments/product-criterion.html" with value=product.child_rules bad=False help=product.child_rules_helptext label="Has parental controls "%}
</div>

<h3 class="h3-heading h3-heading-small">Company shows it cares about its customers</h3>
<h3 class="h3-heading">Company shows it cares about its customers</h3>

<div class="mb-5">
{% include "fragments/product-criterion.html" with value=product.manage_security bad=False help=product.manage_security_helptext label="Company manages security vulnerabilities"%}
{% include "fragments/product-contact.html" with product=product %}
</div>

<h3 class="h3-heading h3-heading-small"><span class="creep-face-emoji">😮</span>What could happen if something went wrong</h3>
<h3 class="h3-heading"><span class="creep-face-emoji">😮</span>What could happen if something went wrong</h3>

<p>{{product.worst_case}}</p>

Expand All @@ -136,7 +136,7 @@ <h3 class="h3-heading h3-heading-small"><span class="creep-face-emoji">😮</spa
<div class="row">
<div class="{{section_class}} mt-5 pt-3 bg-white">
{% if product.updates|length > 0 or coralTalkServerUrl %}
<h3 class="h3-heading mb-4 mb-md-5">Updates</h3>
<h3 class="h2-heading mb-4 mb-md-5">Updates</h3>
{% endif %}
{% if product.updates|length > 0 %}
<div class="mb-5">
Expand All @@ -154,7 +154,7 @@ <h3 class="h3-heading mb-4 mb-md-5">Updates</h3>
<div id="coral-talk-stream"></div>
{% endif %}

<h3 class="h3-heading mb-4">Compare products</h3>
<h3 class="h2-heading mb-4">Compare products</h3>
<div class="row">
{% for product in product.related_products %}
<div class="related-product col-6 col-md-3 mb-3 mb-md-0">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@
<div class="d-flex flex-column flex-md-row justify-content-between align-items-center">
<img class="mr-sm-4 hidden-sm-down" src="/_images/fellowships/svg/applications-open-fellows-optm.svg">
<div>
<h3 class="h3-heading">Applications are open</h3>
<h3 class="h2-heading">Applications are open</h3>
<p>Ready to become a Mozilla fellow? Apply today.</p>
</div>
</div>
<a href="{% url 'fellowships-apply' %}" class="btn btn-normal">Apply here</a>
</div>
</div>
</div>

Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ <h1 class="h1-heading text-capitalize">Be a fellow</h1>
</div>
<p>Who are Mozilla Fellows? They are working to stop the spread of misinformation, to put individuals in control of their data, and to keep artificial intelligence accountable. They are leaders who ensure smart cities and next-generation voice technology are diverse and equitable, and who conduct open research.</p>
<p>Mozilla Fellowships are a transformative experience for emerging leaders concerned with making the internet a safer, more accessible resource for everyone. Fellows expand their network and sphere of influence; design impactful projects with the potential to reach millions; and learn from and collaborate with a global community of thousands of Mozillians. Mozilla Fellows are also awarded competitive compensation and benefits.</p>
<h4 class="h4-heading">Mozilla Fellows fit three particular profiles:</h4>
<h4 class="h3-heading">Mozilla Fellows fit three particular profiles:</h4>
</div>
</div>
<div class="row">
Expand Down
14 changes: 7 additions & 7 deletions network-api/networkapi/fellows/templates/fellows_home.html
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ <h1 class="h1-heading">Fellowships</h1>
{% block mainContent %}
<div class="row mb-5">
<div class="col-12 mt-md-4 mb-5">
<h2 class="h2-heading">What are Mozilla Fellowships?</h2>
<h2 class="h4-heading">What are Mozilla Fellowships?</h2>
</div>
<div class="col-12 mb-4">
<div class="row">
Expand Down Expand Up @@ -87,12 +87,12 @@ <h3 class="h5-heading">Fellows make scientific research more open </h3>
<hr class="hr-emphasis mt-0">
</div>
<div class="col-md-12 mb-5">
<h2 class="h2-heading">Meet Some of the Mozilla Fellows</h2>
<h2 class="h4-heading">Meet Some of the Mozilla Fellows</h2>
</div>
<div class="featured-person col-6 col-sm-4 col-md-3 mb-4 mb-sm-0">
<img src="/_images/fellowships/headshot/OrlandoDelAguila.jpg" class="img-fluid d-block" src="" alt="Headshot"/>
<h2 class="h5-heading my-2">Orlando Del Aguila</h2>
<p class="h6-heading">software engineer, interested in projects that impact the lives of underrepresented communities. Currently, working on Ahwaa.org, a discussion platform for the LGBT community in the Middle East.</p>
<p class="body-small">software engineer, interested in projects that impact the lives of underrepresented communities. Currently, working on Ahwaa.org, a discussion platform for the LGBT community in the Middle East.</p>
<div class="person-social-links mt-3">
<a href="https://twitter.com/eatcodetravel" class="twitter gray small mr-4"></a>
<a href="https://www.linkedin.com/in/orlandodelaguila/" class="linkedIn gray small mr-4"></a>
Expand All @@ -101,7 +101,7 @@ <h2 class="h5-heading my-2">Orlando Del Aguila</h2>
<div class="featured-person col-6 col-sm-4 col-md-3 mb-4 mb-sm-0">
<img src="/_images/fellowships/headshot/AmbaKak.jpg" class="img-fluid d-block" src="" alt="Headshot"/>
<h2 class="h5-heading my-2">Amba Kak</h2>
<p class="h6-heading">researcher and policy consultant, Amba is studying how India’s experience with Aadhaar and other tech/government issues can inform global debates about privacy, digital identity, net-neutrality and other critical issues.</p>
<p class="body-small">researcher and policy consultant, Amba is studying how India’s experience with Aadhaar and other tech/government issues can inform global debates about privacy, digital identity, net-neutrality and other critical issues.</p>
<div class="person-social-links mt-3">
<a href="https://twitter.com/ambaonadventure" class="twitter gray small mr-4"></a>
<a href="https://www.linkedin.com/in/amba-kak-48569b108/" class="linkedIn gray small mr-4"></a>
Expand All @@ -110,15 +110,15 @@ <h2 class="h5-heading my-2">Amba Kak</h2>
<div class="featured-person col-6 col-sm-4 col-md-3 mb-4 mb-sm-0">
<img src="/_images/fellowships/headshot/LinetKwamboka.jpg" class="img-fluid d-block" src="" alt="Headshot"/>
<h2 class="h5-heading my-2">Linet Kwamboka</h2>
<p class="h6-heading">founder and CEO of DataScience LTD, Linet works on understanding the policies that guide data collection and dissemination in East Africa. She plans to publish a report outlining her findings with policy recommendations on existing policies and proposed amendments.</p>
<p class="body-small">founder and CEO of DataScience LTD, Linet works on understanding the policies that guide data collection and dissemination in East Africa. She plans to publish a report outlining her findings with policy recommendations on existing policies and proposed amendments.</p>
<div class="person-social-links mt-3">
<a href="https://twitter.com/linetdata" class="twitter gray small mr-4"></a>
</div>
</div>
<div class="featured-person col-6 col-sm-4 col-md-3 mb-4 mb-sm-0">
<img src="/_images/fellowships/headshot/AnMeChung.jpg" class="img-fluid d-block" src="" alt="Headshot"/>
<h2 class="h5-heading my-2">An-Me Chung</h2>
<p class="h6-heading">former Director of Strategic Partnerships at the Mozilla Foundation, An Me is currently a Resident Fellow focused on equipping people with core web literacy skills needed to read, write, and participate on the internet.</p>
<p class="body-small">former Director of Strategic Partnerships at the Mozilla Foundation, An Me is currently a Resident Fellow focused on equipping people with core web literacy skills needed to read, write, and participate on the internet.</p>
<div class="person-social-links mt-3">
<a href="https://twitter.com/anmechung" class="twitter gray small mr-4"></a>
<a href="https://www.linkedin.com/in/an-me-chung-0b95632a/" class="linkedIn gray small mr-4"></a>
Expand All @@ -134,7 +134,7 @@ <h2 class="h5-heading my-2">An-Me Chung</h2>
<div class="row">
<div class="col-md-12 mb-5">
<hr class="hr-emphasis mt-0">
<h2 class="h2-heading">Why Become a Fellow?</h2>
<h2 class="h4-heading">Why Become a Fellow?</h2>
</div>
</div>
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
<div class="row mb-5">
<div class="col-12 my-5">
<hr class="hr-emphasis mt-0">
<h4 class="h2-heading">Host organizations</h4>
<h4 class="h4-heading">Host organizations</h4>
</div>
<div class="col-12">
<div class="row mb-4">
Expand Down
6 changes: 3 additions & 3 deletions network-api/networkapi/fellows/templates/fellows_support.html
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<!-- Hosting Fellows Content-->
<section class="row mb-5">
<div class="col-12 mb-4">
<h3 class="h3-heading mb-3">Host a Fellow</h3>
<h3 class="h2-heading mb-3">Host a Fellow</h3>
<p>Organizations defending an open and accessible web are the backbone of our fellowship program. They socialize fellows to a global assortment of issues, policies, and technologies, and inspire them with meaningful work that impacts the health of the internet.</p>
<p>In the past five years, the fellowship has partnered with dozens of host organizations around the globe and across sectors, including the American Civil Liberties Union, Amnesty International, Derechos Digitales, European Digital Rights, Freedom of the Press Foundation, and many more. Host organizations are united by a shared goal of a healthy internet.</p>
<p>This year, we are particularly interested in partnering with host organizations whose missions or projects align with Mozilla’s latest impact goal: “<a href="https://medium.com/read-write-participate/slowing-down-asking-questions-looking-ahead-265f6b99810d" target="_blank">better machine decision making</a>,” or ensuring artificial intelligence is developed with ethics, responsibility, and accountability in mind. More broadly, host organizations should be working on initiatives related to online privacy or security; openness; decentralization, digital inclusion; and/or web literacy.</p>
Expand All @@ -34,7 +34,7 @@ <h5 class="h5-heading mb-2">Apply to Host a Fellow</h5>
</div>
<div class="col-12 mb-4">
<p class="mb-4">
<span class="font-weight-bold">Want to learn more?</span>
<span class="font-weight-bold">Want to learn more?</span>
Read more about our <a href="https://medium.com/read-write-participate/apply-to-host-a-mozilla-fellow-d3f82106fcef">call for host applications</a>; read our <a href="https://docs.google.com/document/d/1bK413vD-9AGuaDdYnPzTrl4aJ4HQnG2BSWcb-Haz6NA/edit#" target="_blank">host organization application guide</a>; or email <a href="mailto:fellowships@mozillafoundation.org">fellowships@mozillafoundation.org.</a>
</p>
</div>
Expand All @@ -59,7 +59,7 @@ <h5 class="h5-heading">Supported By</h5>
<!-- Funding Fellows Content-->
<section class="row">
<div class="col-12">
<h3 class="h3-heading my-3">Fund the Fellows</h3>
<h3 class="h2-heading my-3">Fund the Fellows</h3>
<p>We partner with other foundations and organizations across the globe to support the next wave of internet health leaders. Many funders find the expertise, leadership and passion that fellows bring to the experience to be key to catalyzing progress in the internet health field.</p>
</div>
<div class="col-12">
Expand Down
Loading