Skip to content

Commit 659afda

Browse files
Merge pull request #90 from Web-Dev-Path/chore/normalize-font-sizes
Normalizing project font sizes
2 parents c20d308 + e330124 commit 659afda

18 files changed

+108
-64
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/Layout.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
import Nav from './Nav';
22
import Meta from './Meta';
33
import Footer from './Footer';
4+
import styles from '../styles/Layout.module.scss';
45

56
export default function Layout({ children }) {
67
return (
78
<>
89
<Meta />
910
<Nav />
10-
<main>{children}</main>
11+
<main className={styles.main}>{children}</main>
1112
<Footer />
1213
</>
1314
);

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/404.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import Link from 'next/link';
2-
const NotFound = () => {
2+
3+
export default function NotFound() {
34
return (
45
<div className="not-found">
56
<h1>Ooops...</h1>
@@ -12,5 +13,4 @@ const NotFound = () => {
1213
</p>
1314
</div>
1415
);
15-
};
16-
export default NotFound;
16+
}

pages/about-us.js

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

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
}

pages/blog/index.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,9 @@ import Link from 'next/link';
22

33
export default function Blog() {
44
return (
5-
<div>
6-
<h1>Hello from the blog page</h1>
5+
<div className="blog">
6+
<h1>Blog Page</h1>
7+
<p>We're building this page. Stay tuned!</p>
78
<ul>
89
<li>
910
<Link href="/blog/first-post">

pages/contact-us.js

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
11
export default function ContactUs() {
2-
return <h1>Hello from Contact Us</h1>;
2+
return (
3+
<div className="contact-us">
4+
<h1>Contact Us</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
}

0 commit comments

Comments
 (0)