Skip to content

EQ 95: Landing - Rebuild section 1 #103

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

Merged
merged 6 commits into from
Jan 26, 2021
Merged
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
5 changes: 3 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -142,6 +142,7 @@ To convert any image type (`.png`, `.jpg`, etc.) to the `.webp` format, you can
- Order declaration properties alphabetically, but ignore vendor prefixes (`-webkit`, `-moz`, `-o`, `-ms`). Meaning `-webkit-box-shadow` should be treated as starting with the letter `b`.
- Order action selectors alphabetically.
- Place `@media` declarations at the end of properties.
- Place classes alphabetically after element selector. For example: `a {} p {} .button{} .item {}`.
- For example:

```jsx
Expand All @@ -152,8 +153,8 @@ const sectionStyled = styled.section`
-webkit-box-shadow: none;
box-shadow: none;
display: inline-block;
font-family: ${({ theme }) => theme.font.copy.name}, sans-serif;
font-weight: ${({ theme }) => theme.font.copy.regular};
font-family: ${({ theme }) => theme.font.name}, sans-serif;
font-weight: ${({ theme }) => theme.font.regular};
text-align: center;
a {
text-decoration: none;
Expand Down
4 changes: 2 additions & 2 deletions components/404/content.js
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ const SectionStyled = styled.section`
}
p {
font-size: 2em;
font-weight: ${({ theme }) => theme.font.copy.bold};
font-weight: ${({ theme }) => theme.font.bold};
margin: 0 auto 20px auto;
max-width: 600px;
}
Expand All @@ -36,7 +36,7 @@ const SectionStyled = styled.section`
text-transform: uppercase;
}
.subtitle {
font-weight: ${({ theme }) => theme.font.copy.bold};
font-weight: ${({ theme }) => theme.font.bold};
font-size: 2em;
}
@media ${({ theme }) => theme.breakpoint.sm} {
Expand Down
2 changes: 1 addition & 1 deletion components/atom/slides.js
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ const SectionStyled = styled.section`
.link {
background-color: ${({ theme }) => theme.color.navBarLinksListHover};
color: ${({ theme }) => theme.color.white};
font-weight: ${({ theme }) => theme.font.copy.bold};
font-weight: ${({ theme }) => theme.font.bold};
padding: 15px 30px;
text-decoration: none;
text-transform: uppercase;
Expand Down
6 changes: 3 additions & 3 deletions components/browser-opt-out/content.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ const SectionStyled = styled.section`
cursor: pointer;
border: 2px solid ${({ theme }) => theme.color.black};
display: inline-block;
font-family: ${({ theme }) => theme.font.copy.name}, sans-serif;
font-weight: ${({ theme }) => theme.font.copy.medium};
font-family: ${({ theme }) => theme.font.name}, sans-serif;
font-weight: ${({ theme }) => theme.font.semiBold};
text-decoration: none;
text-transform: uppercase;
transition: all 0.25s ease-out;
Expand All @@ -28,7 +28,7 @@ const SectionStyled = styled.section`
}
}
.subtitle {
font-weight: ${({ theme }) => theme.font.copy.bold};
font-weight: ${({ theme }) => theme.font.bold};
margin: 20px auto;
}
`
Expand Down
2 changes: 1 addition & 1 deletion components/careers/application-form.js
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ const SectionStyled = styled.section`
background-color: ${({ theme }) => theme.color.white};
border: 2px solid ${({ theme }) => theme.color.black};
cursor: pointer;
font-weight: ${({ theme }) => theme.font.copy.bold};
font-weight: ${({ theme }) => theme.font.bold};
margin: 0 0 20px 0;
padding: 10px 20px;
text-transform: uppercase;
Expand Down
10 changes: 5 additions & 5 deletions components/contact/info-form.js
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ const SectionStyled = styled.section`
}
.title {
color: ${({ theme }) => theme.color.black};
font-weight: ${({ theme }) => theme.font.copy.bold};
font-weight: ${({ theme }) => theme.font.bold};
font-size: 1.2em;
}
}
Expand All @@ -43,7 +43,7 @@ const SectionStyled = styled.section`
background-color: ${({ theme }) => theme.color.white};
border: 2px solid ${({ theme }) => theme.color.black};
cursor: pointer;
font-weight: ${({ theme }) => theme.font.copy.bold};
font-weight: ${({ theme }) => theme.font.bold};
margin: 0 0 20px 0;
padding: 10px 20px;
text-transform: uppercase;
Expand Down Expand Up @@ -86,18 +86,18 @@ const SectionStyled = styled.section`
color: ${({ theme }) => theme.color.greyMedium};
}
.subtext {
font-weight: ${({ theme }) => theme.font.copy.bold};
font-weight: ${({ theme }) => theme.font.bold};
}
.subtitle {
color: ${({ theme }) => theme.color.black};
font-weight: ${({ theme }) => theme.font.copy.bold};
font-weight: ${({ theme }) => theme.font.bold};
margin: 0 0 20px 0;
}
}
}
.title {
color: ${({ theme }) => theme.color.black};
font-weight: ${({ theme }) => theme.font.copy.bold};
font-weight: ${({ theme }) => theme.font.bold};
font-size: 1.2em;
margin: 0 0 10px 0;
}
Expand Down
48 changes: 23 additions & 25 deletions components/covid-19/article.js
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,6 @@ const SectionStyled = styled.section`
ul {
color: ${({ theme }) => theme.color.greyMedium};
}
.bold {
font-family: ${({ theme }) => theme.font.copy.name}, sans-serif;
font-weight: ${({ theme }) => theme.font.copy.bold};
}
}
.header {
align-items: center;
Expand Down Expand Up @@ -98,7 +94,7 @@ export default function Article() {
Governments can leverage as readily as multinational technology
companies. The most compelling attribute of mobile-phone-based Contact
Tracing is that{' '}
<span className='bold'>
<span className='font-weight-bold'>
benefits can be achieved without breaching the trust and privacy of
the public
</span>
Expand All @@ -110,7 +106,7 @@ export default function Article() {
country and from location to location. All of our models and data are
fully privacy compliant. Our team has studied the Contact Tracing
solutions being deployed in other parts of the world with a{' '}
<span className='bold'>
<span className='font-weight-bold'>
goal to maintain Canadian standards for societal norms and public
trust while adopting international best practices
</span>
Expand All @@ -123,41 +119,43 @@ export default function Article() {
Our technology and our expertise provide the initial footprint for a
Contact Tracing application that is tested and ready. Our focus has
been on{' '}
<span className='bold'>
<span className='font-weight-bold'>
Proactive Prevention NOT Policing Enforcement
</span>{' '}
and our work is based on the following principles:
</p>
<ul>
<li>
<span className='bold'>Prevention</span> – Given the right tools,
stakeholders (e.g. public health officials, first responders,
citizens) can take proactive, preventative action to flatten the
curve.
<span className='font-weight-bold'>Prevention</span> – Given the
right tools, stakeholders (e.g. public health officials, first
responders, citizens) can take proactive, preventative action to
flatten the curve.
</li>
<li>
<span className='bold'>Privacy</span> – No solution should force a
trade-off between privacy and public health. Until COVID-19, few
topics were of more concern than privacy, user control, and public
confidence in the technologies we use in our daily lives.
<span className='font-weight-bold'>Privacy</span> – No solution
should force a trade-off between privacy and public health. Until
COVID-19, few topics were of more concern than privacy, user
control, and public confidence in the technologies we use in our
daily lives.
</li>
<li>
<span className='bold'>Knowledge</span> – Armed with the right
information, we believe individuals will act in accordance with
their own best interest, and that of their families, friends, and
communities.
<span className='font-weight-bold'>Knowledge</span> – Armed with the
right information, we believe individuals will act in accordance
with their own best interest, and that of their families, friends,
and communities.
</li>
<li>
<span className='bold'>Collaboration</span> – Broad-based solutions,
require coalitions – government, not-for-profit institutes, other
technology providers – in order to achieve critical mass.
<span className='font-weight-bold'>Collaboration</span> –
Broad-based solutions, require coalitions – government,
not-for-profit institutes, other technology providers – in order to
achieve critical mass.
</li>
<li>
<span className='bold'>Canadian</span> – We believe it is essential
that Canada leverage made-in-Canada solutions.
<span className='font-weight-bold'>Canadian</span> – We believe it
is essential that Canada leverage made-in-Canada solutions.
</li>
</ul>
<p className='bold'>
<p className='font-weight-bold'>
Contact Tracing technology and expertise resides in Canada now and can
be used to help flatten the curve today.
</p>
Expand Down
2 changes: 1 addition & 1 deletion components/financial-reports/unordered-list.js
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ const SectionStyled = styled.section`
margin: 0 0 10px 0;
a {
color: ${({ theme }) => theme.color.black};
font-weight: ${({ theme }) => theme.font.copy.medium};
font-weight: ${({ theme }) => theme.font.semiBold};
text-decoration: none;
}
h2 {
Expand Down
10 changes: 3 additions & 7 deletions components/index/connected-devices.js
Original file line number Diff line number Diff line change
Expand Up @@ -63,10 +63,6 @@ const SectionStyled = styled.section`
margin: 0 0 10px 0;
width: 40px;
}
.bold {
font-family: ${({ theme }) => theme.font.copy.name}, sans-serif;
font-weight: ${({ theme }) => theme.font.copy.bold};
}
}
}
.top {
Expand Down Expand Up @@ -113,23 +109,23 @@ export default function ConnectedDevices() {
<div>
<MapPin aria-label='map pin' role='img' />
<p>
<span className='bold'>40,000,000</span>
<span className='font-weight-bold'>40,000,000</span>
<br />
Points of interest
</p>
</div>
<div>
<Smile aria-label='smiley face' role='img' />
<p>
<span className='bold'>300,000 +</span>
<span className='font-weight-bold'>300,000 +</span>
<br />
App integrations
</p>
</div>
<div>
<HardDrive aria-label='hard drive disk' role='img' />
<p>
<span className='bold'>7 TB</span>
<span className='font-weight-bold'>7 TB</span>
<br />
Data daily
</p>
Expand Down
Loading