From 6e344d12b1a91d3c767b38ea6353d8c46b480fce Mon Sep 17 00:00:00 2001
From: Joshua Killen <45966243+joshua-killen@users.noreply.github.com>
Date: Fri, 17 Apr 2020 09:47:05 +0100
Subject: [PATCH] merge of contact and about

---
 about/About.html                              |  13 ++++++++++-
 about/about_assets/about.css                  |  21 ++++++++++++++++--
 .../about_assets}/jkillen.png                 | Bin
 contact/contact_assets/contact.css            |   4 ++--
 4 files changed, 33 insertions(+), 5 deletions(-)
 rename {contact/contact_assets => about/about_assets}/jkillen.png (100%)

diff --git a/about/About.html b/about/About.html
index 191f511..2487440 100644
--- a/about/About.html
+++ b/about/About.html
@@ -54,7 +54,18 @@
             <h2>The University</h2>
         </div>
         <div class="aboutMe">
-            <h2>Me</h2>
+            <h2 class="jkillen">Joshua Killen</h2>
+            <img class="profile" src="about_assets/jkillen.png" alt="Profile of Joshua Killen">
+            <article>
+                <details class="bio" open>
+                    <summary class="bioTitle"><b>Bio</b></summary>
+                    <p class="bioContent">Joshua Killen is a Foundation year student at CU Coventry studying Digital Technologies. Interested in computers and physics from a young age, he has been studying the subjects ever since with the hopes of entering a career in cybersecurity.</p>
+                </details>
+            </article>
+            <article>
+                <h3>Contact Details</h3>
+                <a href="mailto:killenj@cu.coventry.ac.uk"><u>@:killenj@cu.coventry.ac.uk</u></a>
+            </article>
         </div>
         
         <footer>
diff --git a/about/about_assets/about.css b/about/about_assets/about.css
index cec93a3..ef9cfff 100644
--- a/about/about_assets/about.css
+++ b/about/about_assets/about.css
@@ -1,3 +1,20 @@
-h1 {
-    padding-top: 25px;
+.jkillen {
+    padding-left: 8px;
 }
+
+.profile {
+    border: 4px solid #f2f2f2;
+}
+
+.bio {
+    font-size: 4vw;
+}
+
+.bioContent {
+    font-size: 0.125em;
+}
+
+.bioTitle {
+    font-family: neon80;
+    font-size: 0.25em;
+}
\ No newline at end of file
diff --git a/contact/contact_assets/jkillen.png b/about/about_assets/jkillen.png
similarity index 100%
rename from contact/contact_assets/jkillen.png
rename to about/about_assets/jkillen.png
diff --git a/contact/contact_assets/contact.css b/contact/contact_assets/contact.css
index 162597d..59893b8 100644
--- a/contact/contact_assets/contact.css
+++ b/contact/contact_assets/contact.css
@@ -11,10 +11,10 @@ h1 {
 }
 
 .bioContent {
-    font-size: 0.125em;
+    font-size: 0.25em;
 }
 
 .bioTitle {
     font-family: neon80;
-    font-size: 0.25em;
+    font-size: 0.5em;
 }
\ No newline at end of file