diff --git a/_cv_entries/1_phd.md b/_cv_entries/1_phd.md index c186837..a5f7709 100644 --- a/_cv_entries/1_phd.md +++ b/_cv_entries/1_phd.md @@ -6,8 +6,10 @@ location: Imperial College London subtitle: "The one-dimensional Long-Range Falikov-Kimball Model" permalink: /CV/PhD -image: /assets/images/koala_logo.svg -alt: "A colourful scientific figure from my work." +img: + src: /assets/images/koala_logo.svg + alt: "A colourful scientific figure from my work." + class: invertable layout: cv_entry read_more: true diff --git a/_cv_entries/2_msc.md b/_cv_entries/2_msc.md index 74d89a6..ad6a0cf 100644 --- a/_cv_entries/2_msc.md +++ b/_cv_entries/2_msc.md @@ -6,8 +6,10 @@ location: Trinity College, Cambridge subtitle: "Imaging Magnetic Phenomena with Scanning Diamond Magnetometry" permalink: /CV/MSc -image: /assets/images/vector_magnet_angle_view.png -alt: "A render of vector magnet that I designed in a CAD program." +img: + src: /assets/projects/vector_magnet/vector_magnet.svg + alt: A line drawn CAD model of vector magnet. + class: invertable # image_markup: diff --git a/_cv_entries/3_cern.md b/_cv_entries/3_cern.md index bf690a0..6dbf5d1 100644 --- a/_cv_entries/3_cern.md +++ b/_cv_entries/3_cern.md @@ -5,8 +5,9 @@ period: 2018 location: Trinity College, Cambridge permalink: /CV/CERN -image: /assets/images/CERN_probes.png -alt: "Some electrical probes on a silicon wafer." +img: + src: /assets/cv/CERN_probes_small.png + alt: Some electrical probes on a silicon wafer. layout: cv_entry read_more: true diff --git a/_cv_entries/4_undergrad.md b/_cv_entries/4_undergrad.md index a937b30..eb1a7f3 100644 --- a/_cv_entries/4_undergrad.md +++ b/_cv_entries/4_undergrad.md @@ -5,9 +5,6 @@ period: 2014 – 2017 location: Trinity College, Cambridge subtitle: My Undergraduate Degree permalink: /CV/Undergrad - -image: -alt: layout: cv_entry read_more: false --- diff --git a/_cv_entries/collective_misbehaviour.md b/_cv_entries/collective_misbehaviour.md index 3f3a6f1..1ab6818 100644 --- a/_cv_entries/collective_misbehaviour.md +++ b/_cv_entries/collective_misbehaviour.md @@ -5,8 +5,9 @@ period: 2018 - 2021 location: Imperial College London subtitle: An interactive web based poetry collaboration. -image: /assets/images/collective_logo.png -alt: A logo for the project composed of overlapping circles. +img: + src: /assets/images/collective_logo.png + alt: A logo for the project composed of overlapping circles. layout: cv_entry --- diff --git a/_cv_entries/creativity_sandpit.md b/_cv_entries/creativity_sandpit.md index 750ad28..785457a 100644 --- a/_cv_entries/creativity_sandpit.md +++ b/_cv_entries/creativity_sandpit.md @@ -3,10 +3,10 @@ type: competition title: Creativity Sandpit period: 2020 location: The Collective + Imperial -subtitle: -image: /assets/images/sandpit.jpeg -alt: A photo of me setting up a rube goldberg machine as part of the event. +img: + src: /assets/images/sandpit.jpeg + alt: A photo of me setting up a rube goldberg machine as part of the event. layout: cv_entry read_more: false diff --git a/_cv_entries/datathon.md b/_cv_entries/datathon.md index 6c6783f..30fc1b5 100644 --- a/_cv_entries/datathon.md +++ b/_cv_entries/datathon.md @@ -5,8 +5,9 @@ period: 2021 location: Imperial College London subtitle: -image: /assets/images/datathon.jpeg -alt: The gather.town room where the competition was held. +img: + src: /assets/images/datathon.jpeg + alt: The gather.town room where the competition was held. layout: cv_entry --- diff --git a/_cv_entries/ecmwf.md b/_cv_entries/ecmwf.md index 29a9e4f..05db313 100644 --- a/_cv_entries/ecmwf.md +++ b/_cv_entries/ecmwf.md @@ -6,8 +6,9 @@ location: Reading, UK subtitle: Research Software Engineer for IoT Observations permalink: /CV/ECMWF -image: /assets/images/ecmwf_just_logo.svg -alt: "ECMWF's logo, it looks like a stylised O joined to a C... or maybe a G joined to a C." +img: + src: /assets/images/ecmwf_just_logo.svg + alt: ECMWF's logo, it looks like a stylised O joined to a C... or maybe a G joined to a C. layout: cv_entry read_more: false diff --git a/_cv_entries/fizzpop.md b/_cv_entries/fizzpop.md index 795b312..d02343a 100644 --- a/_cv_entries/fizzpop.md +++ b/_cv_entries/fizzpop.md @@ -3,10 +3,10 @@ type: side_project title: FizzPOP Makerspace Director period: 2012 – 2014 location: Birmingham -subtitle: -image: /assets/images/fizzpop_logo.gif -alt: The animated logo of fizzpop with a little spinner attached to the f +img: + src: /assets/images/fizzpop_logo.gif + alt: The animated logo of fizzpop with a little spinner attached to the letter f layout: cv_entry --- diff --git a/_cv_entries/makeathon.md b/_cv_entries/makeathon.md index be5d20f..12e222a 100644 --- a/_cv_entries/makeathon.md +++ b/_cv_entries/makeathon.md @@ -3,10 +3,10 @@ type: competition title: MSF Makeathon period: 2021 location: Imperial College Friends of Médecins Sans Frontières -subtitle: -image: /assets/images/makeathon/test_piece.jpg -alt: The gather.town room where the competition was held. +img: + src: /assets/images/makeathon/test_piece.jpg + alt: The gather.town room where the competition was held. layout: cv_entry read_more: true diff --git a/_cv_entries/pyproblems.md b/_cv_entries/pyproblems.md index 8907b7a..98d9d4c 100644 --- a/_cv_entries/pyproblems.md +++ b/_cv_entries/pyproblems.md @@ -5,8 +5,9 @@ period: 2022 location: Imperial College London excerpt: A series of scientific coding exercises on General Relativity. -image: /assets/blog/rendering_general_relativity/thumbnail.gif -alt: A spinning image of the earth but distorted as if it were a black hole. +img: + src: /assets/blog/rendering_general_relativity/thumbnail.gif + alt: A spinning image of the earth but distorted as if it were a black hole. layout: post read_more: true diff --git a/_projects/vector_magnet.md b/_projects/vector_magnet.md new file mode 100644 index 0000000..ec9b115 --- /dev/null +++ b/_projects/vector_magnet.md @@ -0,0 +1,12 @@ +--- +title: Vector Magnet +layout: post +excerpt: Make your magnetic fields all 3D like. +permalink: /projects/vector_magnet + +img: + src: /assets/projects/vector_magnet/vector_magnet.svg + alt: A line drawn CAD model of vector magnet. + class: invertable +--- + diff --git a/_sass/cv.scss b/_sass/cv.scss index 81511e9..cf1eb26 100644 --- a/_sass/cv.scss +++ b/_sass/cv.scss @@ -98,10 +98,10 @@ div.cv-title-container a { border-style: solid; border-radius: 5px; border-width: 1px; - border-color: white; + border-color: transparent; offset: None; - background-color: white; + background-color: transparent; font-size: 1em; } diff --git a/_sass/nav.scss b/_sass/nav.scss index 5c14c79..d784bfd 100644 --- a/_sass/nav.scss +++ b/_sass/nav.scss @@ -7,6 +7,12 @@ nav { color: darkslategray; } +@media (prefers-color-scheme: dark) { + .current { + color: lightslategray; + } +} + @media only screen and (max-width: $horizontal_breakpoint), only screen and (max-height: $vertical_breakpoint) diff --git a/assets/cv/CERN_probes.png b/assets/cv/CERN_probes.png new file mode 100644 index 0000000..bba787f Binary files /dev/null and b/assets/cv/CERN_probes.png differ diff --git a/assets/cv/CERN_probes_small.png b/assets/cv/CERN_probes_small.png new file mode 100644 index 0000000..f030017 Binary files /dev/null and b/assets/cv/CERN_probes_small.png differ diff --git a/assets/images/makeathon/test_piece.jpg b/assets/images/makeathon/test_piece.jpg index 60eeb4a..f72fc6c 100644 Binary files a/assets/images/makeathon/test_piece.jpg and b/assets/images/makeathon/test_piece.jpg differ diff --git a/assets/projects/vector_magnet/vector_magnet.svg b/assets/projects/vector_magnet/vector_magnet.svg new file mode 100644 index 0000000..e9444cd --- /dev/null +++ b/assets/projects/vector_magnet/vector_magnet.svg @@ -0,0 +1,5094 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/cv.html b/cv.html index 26aabd3..6edca38 100644 --- a/cv.html +++ b/cv.html @@ -15,14 +15,6 @@ or have a look at my blog. Click any item for a little more {% for entry in work %} - {% if entry.image_markup %} - {% assign image_markup = entry.image_markup %} - {% else %} - {% capture image_markup %} - {{ entry.alt }} - {% endcapture %} - {% endif %} -
@@ -32,7 +24,9 @@ or have a look at my blog. Click any item for a little more
- {{ image_markup }} + + {{entry.img.alt}} +
{{entry.excerpt}} diff --git a/index.md b/index.md index 8031fda..d8e1213 100644 --- a/index.md +++ b/index.md @@ -9,12 +9,14 @@ mathjax: false {% for post in site.posts %}
+
{{post.alt}}
+

{{ post.title }}

diff --git a/projects.md b/projects.md index 70ebdf4..5a20cd5 100644 --- a/projects.md +++ b/projects.md @@ -1,14 +1,13 @@ --- title: Projects layout: default -redirect_from: - - /projects/ +permalink: /projects/ --- {% for post in site.projects %}