Skip to content

Commit 77a7406

Browse files
Add color variables, adjust general styling
1 parent 18f9c27 commit 77a7406

File tree

7 files changed

+52
-38
lines changed

7 files changed

+52
-38
lines changed

components/Layout.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ export default function Layout({ children }) {
66
return (
77
<>
88
<Nav />
9-
<div className={styles.container}>
10-
<main className={styles.main}>{children}</main>
11-
</div>
9+
<div className={styles.container}>
10+
<main className={styles.main}>{children}</main>
11+
</div>
1212
<Footer />
1313
</>
1414
);

pages/index.js

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -42,14 +42,11 @@ export default function Home() {
4242
</div>
4343
</div>
4444

45-
<div>
46-
<h3 className={styles.centerText}>
45+
<div className = {`${styles.learn_more} ${styles.centerText}`}>
46+
<h3>
4747
If so, you are probably in the right place and should learn more about
4848
us
4949
</h3>
50-
</div>
51-
52-
<div className={styles.centerText}>
5350
<button className={styles.button}>
5451
<Link href="/about-us">Learn More</Link>
5552
</button>

styles/Footer.module.scss

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
@import "mixins";
2+
@import "variables";
23

34
.footer {
45
width: 100%;
5-
background-color: #eaeaea;
6+
background-color: $primary-bg-color;
67
}
78

89
.footerList {
@@ -11,7 +12,7 @@
1112
}
1213

1314
.container {
14-
border-bottom: 1px solid #bebebe;
15+
border-bottom: 1px solid $primary-bg-color;
1516
max-width: 80%;
1617
margin: 0 auto;
1718
padding: 2rem 0;
@@ -30,7 +31,7 @@
3031

3132
&:hover,
3233
&:focus {
33-
color: #666;
34+
color: $accent-color;
3435
}
3536
}
3637

@@ -53,30 +54,30 @@
5354
p {
5455
margin-top: 0.2rem;
5556
font-size: 0.8rem;
56-
color: #696969;
57+
color: $accent-color;
5758
}
5859

5960
.text {
6061
font-size: 1rem;
61-
color: #000;
62+
color: $primary-content-color;
6263
}
6364

6465
input {
6566
height: 2.4rem;
6667
width: 65%;
6768
border-radius: 5px 0 0 5px;
6869
text-indent: 5%;
69-
border: 1px solid #bebebe;
70+
border: 1px solid $primary-bg-color;
7071
}
7172

7273
button {
7374
height: 2.4rem;
7475
width: 35%;
7576
border-radius: 0 5px 5px 0;
76-
background-color: #696969;
77-
color: #fff;
77+
background-color: $accent-color;
78+
color: $white;
7879
font-size: 0.7rem;
79-
border: 1px solid #696969;
80+
border: 1px solid $accent-color;
8081
text-transform: uppercase;
8182
@include transition(opacity 0.3s ease);
8283

@@ -107,14 +108,14 @@
107108

108109
.copyright {
109110
font-size: 0.8rem;
110-
color: #696969;
111+
color: $accent-color;
111112
text-align: center;
112113
margin: 0 auto;
113114
width: 80%;
114115
padding: 0.5rem 0;
115116
}
116117

117-
@media (min-width: 578px) {
118+
@media (min-width: $tablet-breakpoint) {
118119
.container {
119120
display: flex;
120121
justify-content: space-between;
@@ -154,4 +155,4 @@
154155
.copyright {
155156
text-align: left;
156157
}
157-
}
158+
}

styles/Home.module.scss

Lines changed: 15 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
1+
@import "mixins";
12
@import "variables";
23

34
hr {
45
&.divider {
5-
border-top: 1px solid #eaeaea;
6+
border-top: 1px solid $primary-bg-color;
67
width: 100%;
78
margin: 4rem 0;
89
}
@@ -15,7 +16,6 @@ hr {
1516
text-align: center;
1617

1718
a {
18-
color: #0070f3;
1919
text-decoration: none;
2020

2121
&:hover,
@@ -32,6 +32,7 @@ hr {
3232
text-align: center;
3333
max-width: 90%;
3434
margin: 0 auto;
35+
padding: 2rem 0 4rem;
3536
}
3637

3738
.centerText {
@@ -59,14 +60,14 @@ hr {
5960
align-items: center;
6061
justify-content: center;
6162
text-decoration: none;
62-
border: 2px solid #666;
63-
transition: color 0.15s ease, border-color 0.15s ease;
63+
@include transition(color .3s ease);
64+
box-shadow: inset 0px 0px 0px 1px rgb( 0 0 0 / 15%), 0px 3px 4px 2px rgb(0 0 0 / 10%);
6465

6566
&:hover,
6667
&:focus,
6768
&:active {
68-
color: #666;
69-
border-color: #eaeaea;
69+
color: $accent-color;
70+
border-color: $primary-bg-color;
7071
}
7172

7273
p {
@@ -78,19 +79,23 @@ hr {
7879
}
7980
}
8081

82+
.learn_more {
83+
padding: 4rem 0;
84+
}
85+
8186
.button {
8287
height: 2.4rem;
8388
width: 8rem;
8489
border-radius: 5px;
85-
background-color: #696969;
86-
color: #fff;
90+
background-color: $accent-color;
91+
color: $white;
8792
font-size: 0.875rem;
8893
border: none;
8994
text-transform: uppercase;
9095
transition: opacity 0.3s ease;
9196

9297
&:hover {
93-
opacity: 65%;
98+
opacity: 0.6;
9499
cursor: pointer;
95100
}
96101
}
@@ -114,4 +119,4 @@ hr {
114119
width: 90%;
115120
min-height: 7rem;
116121
}
117-
}
122+
}

styles/Nav.module.scss

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -31,15 +31,15 @@
3131
width: 3em;
3232
height: 3em;
3333
padding: 0;
34-
background-color: transparent;
35-
color: black;
34+
background-color: $transparent;
35+
color: $black;
3636
transition: opacity 250ms ease;
3737
position: absolute;
3838
right: 0;
3939

4040
&:hover,
4141
&:focus {
42-
opacity: 0.75;
42+
opacity: 0.6;
4343
}
4444
}
4545

@@ -53,7 +53,7 @@
5353
display: block;
5454
margin: 0 auto;
5555
height: 3px;
56-
background: black;
56+
background-color: $primary-content-color;
5757
}
5858

5959
&::before,
@@ -91,11 +91,11 @@
9191

9292
.navLink {
9393
text-decoration: none;
94-
color: black;
94+
color: $primary-content-color;
9595

9696
&:focus,
9797
&:hover {
98-
opacity: 0.65;
98+
opacity: 0.6;
9999
}
100100
}
101101

@@ -135,4 +135,4 @@
135135
display: flex;
136136
justify-content: space-between;
137137
}
138-
}
138+
}

styles/_variables.scss

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,15 @@
11
// Media Query Breakpoints
22
$mobile-breakpoint: 320px;
3+
$lg-mobile-breakpoint: 578px;
34
$tablet-breakpoint: 768px;
45
$desktop-breakpoint: 1024px;
56
$large-desktop-breakpoint: 1440px;
6-
$extra-large-breakpoint: 2560px;
7+
$extra-large-breakpoint: 2560px;
8+
9+
//Colors
10+
$primary-content-color: #212121;
11+
$primary-bg-color: #eaeaea;
12+
$accent-color: #666666;
13+
$black: #000000;
14+
$white: #ffffff;
15+
$transparent: transparent;

styles/globals.scss

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
11
@import "mixins";
2+
@import "variables";
23

34
html,
45
body {
56
padding: 0;
67
margin: 0;
78
font-family: -apple-system, BlinkMacSystemFont, Segoe UI, Roboto, Oxygen,
89
Ubuntu, Cantarell, Fira Sans, Droid Sans, Helvetica Neue, sans-serif;
10+
color: $primary-content-color;
911
}
1012

1113
a {

0 commit comments

Comments
 (0)