Skip to content

Commit 08fc20b

Browse files
Normalizing font sizes
1 parent ae3f247 commit 08fc20b

File tree

10 files changed

+56
-52
lines changed

10 files changed

+56
-52
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,3 +29,4 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
2929
- updated TwoColumn.js component with style props
3030
- updated favicon icon and add OG
3131
- normalized container use on components
32+
- normalized font sizes

components/Footer.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ export default function Footer() {
2323
<a className={footerStyles.footer__logo} title="Go to the Homepage">
2424
<Image
2525
src="/images/svg/logo.svg"
26-
height={326}
27-
width={326}
26+
height={250}
27+
width={250}
2828
alt="Logo"
2929
priority
3030
/>

components/mailchimp/NewsletterForm.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ const NewsletterForm = ({ status, message, onValidated }) => {
9090
onKeyUp={event => handleInputKeyEvent(event)}
9191
/>
9292
<button className={newsletterStyles.newsletter__button}>
93-
subscribe
93+
Subscribe
9494
</button>
9595
</form>
9696
<div className={newsletterStyles.newsletterFormInfo}>

pages/blog/first-post.js

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
11
export default function FirstPost() {
2-
return <h1>First Post</h1>;
2+
return (
3+
<div class="post">
4+
<h1>First Post</h1>
5+
<p>We're building this page.</p>
6+
<p>Stay tuned!</p>
7+
</div>
8+
);
39
}

styles/Card.module.scss

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,6 @@
3333
}
3434

3535
.content {
36-
font-style: normal;
37-
font-weight: normal;
38-
font-size: 1.5rem;
39-
line-height: 2rem;
4036
display: flex;
4137
align-items: center;
4238
}

styles/Footer.module.scss

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
display: flex;
1414
justify-content: space-between;
1515
align-items: center;
16-
padding: unset;
1716
text-align: left;
1817
}
1918
}

styles/Home.module.scss

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,7 @@
22
@use './mixins' as *;
33

44
.title {
5-
margin: 0;
6-
line-height: 1.15;
7-
font-size: 2.5rem;
85
text-align: center;
9-
10-
@include desktop-breakpoint-plus {
11-
font-size: 4.5rem;
12-
}
136
}
147

158
.description {

styles/Newsletter.module.scss

Lines changed: 13 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
.newsletterFormError,
99
.newsletterFormSuccess,
1010
.newsletterFormSending {
11-
color: black;
11+
color: $primary-content-color;
1212
margin-top: 1rem;
1313

1414
@include tablet {
@@ -38,17 +38,17 @@
3838
}
3939

4040
&__title {
41-
font-size: 1.45rem;
42-
color: $black;
41+
font-size: 1.75rem;
42+
color: $primary-content-color;
4343
margin: 0;
4444

4545
@include large-desktop {
46-
font-size: 2rem;
46+
font-size: 2.25rem;
4747
}
4848
}
4949

5050
&__form {
51-
@include tablet {
51+
@include desktop {
5252
display: flex;
5353
align-items: center;
5454
gap: 1rem;
@@ -61,22 +61,19 @@
6161

6262
&__input {
6363
display: block;
64+
font-size: 1.2rem;
6465
border-radius: 1rem;
6566
height: 2rem;
6667
margin: 1rem 0;
6768
padding: 1rem 1.25rem;
6869
border: none;
6970
width: 100%;
70-
max-width: 25rem;
71-
72-
@include tablet {
73-
width: 10rem;
74-
}
7571

7672
@include large-desktop {
7773
font-size: 1.5rem;
7874
height: 3rem;
7975
border-radius: 3rem;
76+
max-width: 25rem;
8077
}
8178

8279
&::placeholder {
@@ -89,26 +86,27 @@
8986
}
9087

9188
&__name {
92-
@include tablet {
89+
@include desktop {
9390
width: 12.25rem;
9491
}
9592
}
9693

9794
&__email {
98-
@include tablet {
99-
width: 18rem;
95+
@include desktop {
96+
width: 16rem;
10097
}
10198
@include large-desktop {
10299
width: 26rem;
103100
}
104101
}
105102

106103
&__button {
107-
border-radius: 1rem;
104+
border-radius: 1.2rem;
105+
font-size: 1.2rem;
108106
border: none;
109107
background-color: $dark-bg-color;
110108
color: $white;
111-
height: 2rem;
109+
height: 2.2rem;
112110
padding: 0 3rem;
113111
font-weight: 700;
114112
transition: 0.3s ease;

styles/TwoColumn.module.scss

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -33,23 +33,11 @@
3333
}
3434

3535
.title {
36-
font-family: $heading-font;
37-
font-style: normal;
3836
font-weight: bold;
39-
font-size: 3.5rem;
4037
color: $primary-content-color;
4138
margin: 0;
42-
43-
@include tablet {
44-
font-size: 4.5rem;
45-
line-height: 5rem;
46-
}
4739
}
4840
.content {
49-
font-style: normal;
50-
font-weight: normal;
51-
font-size: 1.5rem;
52-
line-height: 2rem;
5341
display: flex;
5442
align-items: center;
5543
margin: 3.875rem 0 2.5rem;

styles/globals.scss

Lines changed: 32 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,36 @@ h6 {
1818
font-family: $heading-font, sans-serif;
1919
}
2020

21+
p,
22+
li {
23+
font-size: 1.25rem;
24+
line-height: 1.938rem;
25+
@include desktop {
26+
font-size: 1.5rem;
27+
}
28+
}
29+
30+
h1 {
31+
font-size: 3rem;
32+
line-height: 5rem;
33+
@include desktop {
34+
font-size: 5.5rem;
35+
}
36+
}
37+
38+
h2 {
39+
font-size: 3rem;
40+
line-height: 5rem;
41+
@include desktop {
42+
font-size: 4.5rem;
43+
}
44+
}
45+
46+
h3 {
47+
font-size: 1.5rem;
48+
line-height: 1.938rem;
49+
}
50+
2151
ul {
2252
list-style: none;
2353
}
@@ -39,19 +69,12 @@ a {
3969
.not-found,
4070
.about-us,
4171
.contact-us,
42-
.blog {
72+
.blog,
73+
.post {
4374
display: flex;
4475
flex-direction: column;
4576
justify-content: center;
4677
justify-items: center;
4778
margin-top: 10%;
4879
align-items: center;
4980
}
50-
51-
.not-found a {
52-
color: $primary-content-color;
53-
54-
&:hover {
55-
opacity: 0.6;
56-
}
57-
}

0 commit comments

Comments
 (0)