From 990742c8d7b8df584bf86c57346dee3465fadde0 Mon Sep 17 00:00:00 2001 From: Nye Evans Date: Sun, 27 Dec 2020 15:11:50 +0000 Subject: [PATCH] replaced file with index to make it default page, also changed how font works font now uses vw units but its not fully added yet --- Mainpage.css | 13 ++++++------- Mainpage.html => index.html | 7 +++++-- 2 files changed, 11 insertions(+), 9 deletions(-) rename Mainpage.html => index.html (91%) diff --git a/Mainpage.css b/Mainpage.css index a46fc33..168da2a 100644 --- a/Mainpage.css +++ b/Mainpage.css @@ -15,7 +15,6 @@ body{ margin: 20; background-color: #221A0F; - max-height: 100rem; display: grid; grid-template-columns: repeat(12, 1fr); grid-template-rows: repeat(20, 1fr); @@ -27,11 +26,10 @@ h1, h2, h3{ background-color: #ffa500; background: radial-gradient(#E39823 40%, #8D5001); border-radius: 5px; - /*url("C:/Users/Nye/Documents/GitHub/Portfolio-Site/Images/NoiseFilter.png");*/ } h1{ - font-size: 500%; + font-size: 5vw; padding-left: 6; grid-column-start: 1; grid-column-end: 5; @@ -40,9 +38,8 @@ h1{ } h2{ + font-size: 1vw; padding: 5; - letter-spacing: 0.05rem; - line-height: 1.2rem; grid-column-start: 2; grid-column-end: 12; grid-row-start: 8; @@ -60,9 +57,11 @@ h2{ grid-column-start: 2; grid-column-end: 12; grid-row-start: 12; - grid-row-end: 14; + grid-row-end: 13; + object-fit: contain; + display: block; width: 100%; - height: auto; + max-height: 100%; } .orangeBack{ /*for anything that isnt a tag*/ diff --git a/Mainpage.html b/index.html similarity index 91% rename from Mainpage.html rename to index.html index 58bddab..a64e0b4 100644 --- a/Mainpage.html +++ b/index.html @@ -11,8 +11,11 @@

"But I must explain to you how all this mistaken idea of denouncing pleasure and praising pain was born and I will give you a complete account of the system, and expound the actual teachings of the great explorer of the truth, the master-builder of human happiness. No one rejects, dislikes, or avoids pleasure itself, because it is pleasure, but because those who do not know how to pursue pleasure rationally encounter consequences that are extremely painful. Nor again is there anyone who loves or pursues or desires to obtain pain of itself, because it is pain, but because occasionally circumstances occur in which toil and pain can procure him some great pleasure. To take a trivial example, which of us ever undertakes laborious physical exercise, except to obtain some advantage from it? But who has any right to find fault with a man who chooses to enjoy a pleasure that has no annoying consequences, or one who avoids a pain that produces no resultant pleasure?"

-
- + + \ No newline at end of file