Merge pull request #1 from OLT2000/my-first-branch

Merge changes from first-branch into Main
OLT2000 · Jul 15, 2024 · d3b75ac · d3b75ac
2 parents 736609d + c192118
commit d3b75ac
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 24 deletions.
diff --git a/images/Red_Panda.jpg b/images/Red_Panda.jpg
diff --git a/index.html b/index.html
@@ -4,37 +4,37 @@
     <meta charset="UTF-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <!-- TODO: change the title tag - this is the name of the tab title -->
-    <title>My Profile</title>
+    <!-- TODO[DONE]: change the title tag - this is the name of the tab title -->
+    <title>My GitHub Profile</title>
     <script src="https://kit.fontawesome.com/a86c93a2cb.js" crossorigin="anonymous"></script>
     <link rel="stylesheet" href="style.css">
   </head>
   <body>
     <div class="container">
       <div class="card-white">
-        <!-- TODO: change the name and subtitle below -->
-        <h1>Hello I'm [edit your name here]</h1>
-        <h2>[Edit your subtitle]</h2>
-        <img src="images/github-icon.webp" alt="Profile Picture of Aaron Lambley" width="200px" height="200px" class="img-circle">
-        <h3>^ change the image above ^</h3>
+        <!-- TODO[DONE]: change the name and subtitle below -->
+        <h1>Hello I'm Ollie</h1>
+        <h2>Here's a subheader.</h2>
+        <img src="images/Red_Panda.jpg" alt="Profile Picture of Ollie Thurston" width="200px" height="200px" class="img-circle">
+        <h3>Here is a Red Panda</h3>
         <p>
-          Write something about yourself
+          I studied at the University of Bristol.
         </p>
-        <!-- TODO: update the email below - think about how the email link operate. Does it open in the same or new tab? -->
-        <a href="mailto:test@test.com" class="btn-blue">Contact Me</a>
+        <!-- TODO[DONE]: update the email below - think about how the email link operate. Does it open in the same or new tab? -->
+        <a href="mailto:olliethurston1@gmail.com" class="btn-blue">Contact Me</a>
       </div>
       <div class="card-white">
         <h3>Follow Me</h3>
-        <!-- TODO: add some social links here and use Fontawesome icons -->
+        <!-- TODO[DONE]: add some social links here and use Fontawesome icons -->
         <!-- https://fontawesome.com/search?o=r&m=free -->
         <ul class="list-inline">
           <li>
-            <a href="https://github.com/lambley">
+            <a href="https://github.com/OLT2000">
               <i class="fa-brands fa-github icon-larger"></i>
             </a>
           </li>
           <li>
-            <a href="https://www.instagram.com/maya_the_collie_cross/">
+            <a href="https://www.instagram.com/thurstxn_/">
               <i class="fa-brands fa-instagram icon-larger"></i></a> *
           </li>
         </ul>

diff --git a/style.css b/style.css
@@ -27,16 +27,16 @@
 
 body {
   background-color:aliceblue;
-  /* TODO: change the font - be mindful of how fonts are imported in the webpage */
-  font-family: 'Noto Sans', sans-serif;
-  /* TODO: change the background colour */
-  color: #827397;
+  /* TODO[DONE]: change the font - be mindful of how fonts are imported in the webpage */
+  font-family: 'Papyrus', sans-serif;
+  /* TODO[DONE]: change the background colour */
+  color: #2d82c8;
   font-size: 16px;
   line-height:normal;
 }
 h1, h2, h3 {
-  /* TODO: change the header font colour */
-  color: #4D4C7D;
+  /* TODO[DONE]: change the header font colour */
+  color: #8acd25;
 }
 
 h1 {
@@ -73,8 +73,8 @@ a:hover {
 }
 
 .card-white {
-  /* TODO: change the card background colour */
-  background-color: white;
+  /* TODO[DONE]: change the card background colour */
+  background-color: rgb(255, 255, 255);
   padding: 40px;
   box-shadow: 0px 10px 30px rgba(0 0 0 / 10%);
   border-radius: 4px;
@@ -83,9 +83,9 @@ a:hover {
 }
 
 .btn-blue {
-  /* TODO: change the button colour */
-  background-color:#4D4C7D;
-  color: #E9D5CA;
+  /* TODO[DONE]: change the button colour */
+  background-color:#6966e5;
+  color: #fefefe;
   padding: 15px 20px;
   border-radius: 4px;
 }