Skip to content

Commit

Permalink
Reworked font size to be based on default font size (16px), not custo…
Browse files Browse the repository at this point in the history
…m 20px
  • Loading branch information
ZachMc21 committed Nov 25, 2024
1 parent feeab7c commit dd472bc
Show file tree
Hide file tree
Showing 8 changed files with 34 additions and 37 deletions.
2 changes: 1 addition & 1 deletion webpage/main.scss
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@
@use "partials/personal";
@use "partials/footer";

/* Selectors cheat sheet: https://dev.to/dawnind/css3-selectors-cheat-sheet-6dk */
/* Selectors cheat sheet: https://dev.to/dawnind/css3-selectors-cheat-sheet-6dk */
2 changes: 1 addition & 1 deletion webpage/partials/_footer.scss
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ footer {

footer p {
color: v.$light-blue;
font-size: 0.5rem;
font-size: 0.75rem;
font-style: italic;
text-align: center;
}
3 changes: 0 additions & 3 deletions webpage/partials/_global.scss
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,6 @@
font-family: Helvetica, Arial, sans-serif;
margin: 0;
}
html {
font-size: 20px;
}
body {
background-color: v.$navy-blue;
}
Expand Down
6 changes: 3 additions & 3 deletions webpage/partials/_personal.scss
Original file line number Diff line number Diff line change
Expand Up @@ -9,16 +9,16 @@
}
#personal_life h1 {
text-align: center;
font-size: 1.5rem;
font-size: 1.75rem;
font-style: italic;
margin-bottom: 1%;
}
#personal_life > p ~ h1 {
margin-top: 3%;
}
#personal_life p {
font-size: 1rem;
font-size: 1.25rem;
text-align: center;
line-height: 1.25rem;
line-height: 1.5rem;
color: v.$navy-blue;
}
19 changes: 11 additions & 8 deletions webpage/partials/_projects.scss
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,11 @@
margin: 0 auto;
margin-top: 4%;
}

#project_menu a {
display: block;
padding: 5% 5%;
font-size: 1rem;
font-size: 1.5rem;
background-color: v.$light-blue;
color: v.$navy-blue;
border: v.$navy-blue 2px solid;
Expand All @@ -28,6 +29,7 @@
#project_menu a:hover {
background-color: v.$gray-blue;
}

.project_container {
width: 70%;
padding: 3%;
Expand All @@ -47,13 +49,13 @@
h1.project_title {
text-align: center;
font-weight: bold;
font-size: 2rem;
font-size: 2.5rem;
padding: 1rem;
}
.project_desc p {
padding: 1% 10%;
text-align: center;
font-size: 1.25rem;
font-size: 1.5rem;
}
.project_divider ~ .project_content > .project_title {
padding-top: 3%;
Expand Down Expand Up @@ -83,29 +85,30 @@
.project_skills ul li {
font-family: "Lucida Console", Courier, monospace;
list-style-type: none;
font-size: 1rem;
font-size: 1.25rem;
line-height: 1.2;
}
.project_skills ul li:before {
content: ">";
}

.takeaways {
border: 2% solid v.$navy-blue;
margin: 2% auto;
width: 90%;
}
.takeaways h1 {
text-align: center;
text-decoration: underline rgb(5, 37, 59);
font-size: 1.25rem;
text-decoration: underline v.$navy-blue; //Why isn't this border working?
font-size: 1.5rem;
margin-top: 5%;
margin-bottom: 3%;
font-weight: normal;
}
.takeaways p {
padding: 0 10% 2% 10%;
padding-bottom: 0.75rem;
font-size: 1rem;
line-height: 1rem;
line-height: 1.25rem;
text-align: center;
font-style: italic;
}
Expand Down
4 changes: 2 additions & 2 deletions webpage/partials/_skills.scss
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@

#skills .column {
text-align: left;
font-size: 1.25rem;
font-size: 1.5rem;
margin: 1%;
padding: 3%;
background-color: v.$light-blue;
Expand All @@ -45,6 +45,6 @@ div#skills .column ul {
div#skills .column ul p {
margin: 0;
margin-left: 7.5%;
font-size: 1.25rem;
font-size: 1.5rem;
font-style: italic;
}
33 changes: 15 additions & 18 deletions webpage/styles/main.css
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,6 @@
margin: 0;
}

html {
font-size: 20px;
}

body {
background-color: #091d3a;
}
Expand Down Expand Up @@ -132,7 +128,7 @@ a:visited {
}
#skills .column {
text-align: left;
font-size: 1.25rem;
font-size: 1.5rem;
margin: 1%;
padding: 3%;
background-color: rgb(203, 239, 252);
Expand All @@ -145,7 +141,7 @@ div#skills .column ul {
div#skills .column ul p {
margin: 0;
margin-left: 7.5%;
font-size: 1.25rem;
font-size: 1.5rem;
font-style: italic;
}

Expand All @@ -158,7 +154,7 @@ div#skills .column ul p {
#project_menu a {
display: block;
padding: 5% 5%;
font-size: 1rem;
font-size: 1.5rem;
background-color: rgb(203, 239, 252);
color: #091d3a;
border: #091d3a 2px solid;
Expand Down Expand Up @@ -189,13 +185,13 @@ div#skills .column ul p {
h1.project_title {
text-align: center;
font-weight: bold;
font-size: 2rem;
font-size: 2.5rem;
padding: 1rem;
}
.project_desc p {
padding: 1% 10%;
text-align: center;
font-size: 1.25rem;
font-size: 1.5rem;
}
.project_divider ~ .project_content > .project_title {
padding-top: 3%;
Expand Down Expand Up @@ -223,28 +219,29 @@ div#skills .column ul p {
.project_skills ul li {
font-family: "Lucida Console", Courier, monospace;
list-style-type: none;
font-size: 1rem;
font-size: 1.25rem;
line-height: 1.2;
}
.project_skills ul li:before {
content: ">";
}
.takeaways {
border: 2% solid #091d3a;
margin: 2% auto;
width: 90%;
}
.takeaways h1 {
text-align: center;
text-decoration: underline rgb(5, 37, 59);
font-size: 1.25rem;
text-decoration: underline #091d3a;
font-size: 1.5rem;
margin-top: 5%;
margin-bottom: 3%;
font-weight: normal;
}
.takeaways p {
padding: 0 10% 2% 10%;
padding-bottom: 0.75rem;
font-size: 1rem;
line-height: 1rem;
line-height: 1.25rem;
text-align: center;
font-style: italic;
}
Expand Down Expand Up @@ -288,7 +285,7 @@ div#skills .column ul p {

#personal_life h1 {
text-align: center;
font-size: 1.5rem;
font-size: 1.75rem;
font-style: italic;
margin-bottom: 1%;
}
Expand All @@ -298,9 +295,9 @@ div#skills .column ul p {
}

#personal_life p {
font-size: 1rem;
font-size: 1.25rem;
text-align: center;
line-height: 1.25rem;
line-height: 1.5rem;
color: #091d3a;
}

Expand All @@ -315,7 +312,7 @@ footer {

footer p {
color: rgb(203, 239, 252);
font-size: 0.5rem;
font-size: 0.75rem;
font-style: italic;
text-align: center;
}
Expand Down
2 changes: 1 addition & 1 deletion webpage/styles/main.css.map

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit dd472bc

Please sign in to comment.