From feb3b59400ec8deafaee6c5b4c98cd4e5ff72656 Mon Sep 17 00:00:00 2001 From: Matthew Grove Date: Mon, 10 Jun 2024 19:16:13 +0100 Subject: [PATCH] Update how about info retrieved --- _data/profile.yml | 4 +++- _includes/about.md | 5 ----- _subpages/01-about.md | 3 +-- assets/css/style.css | 26 +++++++++++++------------- assets/js/script.js | 2 +- 5 files changed, 18 insertions(+), 22 deletions(-) delete mode 100644 _includes/about.md diff --git a/_data/profile.yml b/_data/profile.yml index 0a0519f..9460328 100644 --- a/_data/profile.yml +++ b/_data/profile.yml @@ -9,4 +9,6 @@ socials: - link: https://github.com/mgrove36 icon: github - link: https://linkedin.com/in/mgrove36 - icon: linkedin \ No newline at end of file + icon: linkedin +about: | + A cyber security & software engineer with a special interest in application and network security, I am currently studying MEng Computer Science with Cyber Security at the University of Southampton. I am also an ex- RAF Cadet Warrant Officer and Lord-Lieutenant’s Cadet, where I represented all cadets in Berkshire; currently an Officer Cadet at Southampton University Air Squadron and Service Instructor in the Combined Cadet Force. diff --git a/_includes/about.md b/_includes/about.md deleted file mode 100644 index 6a1de97..0000000 --- a/_includes/about.md +++ /dev/null @@ -1,5 +0,0 @@ -A cyber security & software engineer with a special interest in application and network security, I am currently studying MEng Computer Science with Cyber Security at the University of Southampton. I am also an ex- RAF Cadet Warrant Officer and Lord-Lieutenant’s Cadet, where I represented all cadets in Berkshire; currently an Officer Cadet at Southampton University Air Squadron and Service Instructor in the Combined Cadet Force. - -I love running and flying - fuelled by a successful career as an RAF cadet. During this time I reached the rank of Cadet Warrant Officer and, at the Royal International Air Tattoo, was the first CCF cadet to earn "Best Cadet" in its 30+ year history. I was also awarded a highly selective flying scholarship, and the position of Lord-Lieutenant's Cadet: an aide to the monarch's representative in Berkshire, representing the county's cadets, in 2021/22. Now furthering this interest as an Officer Cadet at Southampton University Air Squadron, I also volunteer as staff at a cadet unit. - -I have historically volunteered with several organisations and societies, most recently as Vice President at Southampton University Cyber Security Society - organising weekly sessions and liaising with students, staff, and industry partners to ensure the success of the society. I also volunteer with the Jon Egging Trust: a charity that aims to inspire underprivileged young people to reach their full potentials. \ No newline at end of file diff --git a/_subpages/01-about.md b/_subpages/01-about.md index 4e1e278..e67947e 100644 --- a/_subpages/01-about.md +++ b/_subpages/01-about.md @@ -4,8 +4,7 @@ permalink: / ---
- {% capture about %}{% include about.md %}{% endcapture %} - {{ about | markdownify }} + {{ site.data.profile.about | markdownify }}
diff --git a/assets/css/style.css b/assets/css/style.css index 0004142..b081e19 100644 --- a/assets/css/style.css +++ b/assets/css/style.css @@ -33,15 +33,15 @@ hsla(240, 1%, 18%, 0.251) 0%, hsla(240, 2%, 11%, 0) 100% ), hsl(240, 2%, 13%); - --bg-gradient-yellow-1: linear-gradient( + --bg-gradient-primary-1: linear-gradient( to bottom right, - hsl(45, 100%, 71%) 0%, - hsla(36, 100%, 69%, 0) 50% + var(--secondary-color) 0%, + hsla(357, 100%, 72%, 0) 50% ); - --bg-gradient-yellow-2: linear-gradient( + --bg-gradient-primary-2: linear-gradient( 135deg, - hsla(45, 100%, 71%, 0.251) 0%, - hsla(35, 100%, 68%, 0) 59.86% + hsla(357, 92%, 63%, 0.251) 0%, + hsla(357, 100%, 72%, 0) 59.86% ), hsl(240, 2%, 13%); --border-gradient-onyx: linear-gradient( to bottom right, @@ -49,9 +49,9 @@ hsla(0, 0%, 25%, 0) 50% ); --text-gradient-yellow: linear-gradient( - to right, - hsl(45, 100%, 72%), - hsl(35, 100%, 68%) + to right, + var(--primary-color), + var(--secondary-color) ); --text-gradient-primary: linear-gradient( to right, @@ -401,10 +401,10 @@ main { } .info_more-btn:hover, -.info_more-btn:focus { background: var(--bg-gradient-yellow-1); } +.info_more-btn:focus { background: var(--bg-gradient-primary-1); } .info_more-btn:hover::before, -.info_more-btn:focus::before { background: var(--bg-gradient-yellow-2); } +.info_more-btn:focus::before { background: var(--bg-gradient-primary-2); } .info_more-btn span { display: none; } @@ -1232,9 +1232,9 @@ textarea.form-input::-webkit-resizer { display: none; } .form-btn ion-icon { font-size: 16px; } -.form-btn:hover { background: var(--bg-gradient-yellow-1); } +.form-btn:hover { background: var(--bg-gradient-primary-1); } -.form-btn:hover::before { background: var(--bg-gradient-yellow-2); } +.form-btn:hover::before { background: var(--bg-gradient-primary-2); } .form-btn:disabled { opacity: 0.7; diff --git a/assets/js/script.js b/assets/js/script.js index 776e17e..57962c6 100644 --- a/assets/js/script.js +++ b/assets/js/script.js @@ -61,7 +61,7 @@ const selectItems = document.querySelectorAll("[data-select-item]"); const selectValue = document.querySelector("[data-selecct-value]"); const filterBtn = document.querySelectorAll("[data-filter-btn]"); -select.addEventListener("click", function () { elementToggleFunc(this); }); +if (select) select.addEventListener("click", function () { elementToggleFunc(this); }); // add event in all select items for (let i = 0; i < selectItems.length; i++) {