Merge branch 'cute-portfolio'

_includes/archive-single-portfolio.html

@@ -0,0 +1,65 @@
+{% include base_path %}
+
+{% if post.header.teaser %}
+  {% capture teaser %}{{ post.header.teaser }}{% endcapture %}
+{% else %}
+  {% assign teaser = site.teaser %}
+{% endif %}
+
+{% if post.id %}
+  {% assign title = post.title | markdownify | remove: "<p>" | remove: "</p>" %}
+{% else %}
+  {% assign title = post.title %}
+{% endif %}
+
+<style>
+h2 {margin: 1em 0 0.5em;}
+article {display: flex; padding: 1em 0 0;}
+div.flex_img {flex: 0 0 auto; width: 200px; display: flex; flex-direction: column; justify-content: center;}
+div.flex_text {flex: 1 1 auto; padding-left: 30px;}
+img.flex {align-self: center;}
+</style>
+
+<div class="{{ include.type | default: "list" }}__item">
+  <article class="archive__item" itemscope itemtype="http://schema.org/CreativeWork">
+
+    {% if post.image %}
+    <div class = "flex_img"><img class = "flex" src = "{{ post.image | prepend: '/images/'}}"></div>
+    {% endif %}
+    <div class = "flex_text">
+    <h2 class="archive__item-title" itemprop="headline">
+      {% if post.link %}
+        <a href="{{ post.link }}">{{ title }}</a> <a href="{{ base_path }}{{ post.url }}" rel="permalink"><i class="fa fa-link" aria-hidden="true" title="permalink"></i><span class="sr-only">Permalink</span></a>
+      {% else %}
+        <a href="{{ base_path }}{{ post.url }}" rel="permalink">{{ title }}</a>
+      {% endif %}
+    </h2>
+
+    {% if post.read_time %}
+      <p class="page__meta"><i class="fa fa-clock-o" aria-hidden="true"></i> {% include read-time.html %}</p>
+    {% endif %}
+
+        {% if post.collection == 'teaching' %}
+          <p> {{ post.type }}, <i>{{ post.venue }}</i>, {{ post.date | default: "1900-01-01" | date: "%Y" }} </p>
+        {% elsif post.collection == 'publications' %}
+          <p>Published in <i>{{ post.venue }}</i>, {{ post.date | default: "1900-01-01" | date: "%Y" }} </p>
+        {% elsif post.date %}
+         <p class="page__date"><strong><i class="fa fa-fw fa-calendar" aria-hidden="true"></i> {{ site.data.ui-text[site.locale].date_label | default: "Published:" }}</strong> <time datetime="{{ post.date | default: "1900-01-01" | date_to_xmlschema }}">{{ post.date | default: "1900-01-01" | date: "%B %d, %Y" }}</time></p>
+        {% endif %}
+
+    {% if post.excerpt and site.read_more != 'enabled' %}
+    <p class="archive__item-excerpt" itemprop="description">{{ post.excerpt | markdownify }}</p>
+    {% elsif post.excerpt and site.read_more == 'enabled' %}
+    <p class="archive__item-excerpt" itemprop="description"><p>{{ post.excerpt | markdownify | remove: '<p>' | remove: '</p>' }}<strong><a href="{{ base_path }}{{ post.url }}" rel="permalink"> Read more</a></strong></p></p>
+    {% endif %}
+
+    {% if post.citation and post.paperurl %}
+      <p>Recommended citation: {{ post.citation }} <a href="{{ post.paperurl }}"><u>{{ post.paperurl }}</u></a></p>
+    {% elsif post.citation %}
+      <p>Recommended citation: {{ post.citation }} </p>
+    {% elsif post.paperurl %}
+      <p>Download <a href=" {{ post.paperurl }} "><u>here</u></a></p>
+    {% endif %}
+    </div>
+  </article>
+</div>

_pages/portfolio.html

@@ -7,8 +7,38 @@ author_profile: true
 
 {% include base_path %}
 
-
 {% for post in site.portfolio %}
-  {% include archive-single.html %}
+  {% include archive-single-portfolio.html %}
 {% endfor %}
 
+{% comment %}
+
+<div class="feature__wrapper">
+  {% for post in site.portfolio %}
+    <div class="feature__item">
+      <div class="archive__item">
+
+          <div class="archive__item-teaser" style="height:250px;">
+            <img src = "{{ post.image | prepend: '/images/'}}"
+            alt="{{post.alt}}}">
+          </div>
+        <div class="archive__item-body">
+            <h2 class="archive__item-title">{{post.title}}</h2>
+            {% if post.subtitle %}
+            <p>{{post.subtitle}}</p>
+            {% endif %}
+            <div class="archive__item-excerpt">
+              <p itemprop="description">{{ post.excerpt | markdownify }}</p>
+            </div>
+        </div>
+      </div>
+    </div>
+    {% endfor %}
+    </div>
+
+
+{% include feature_row %}
+
+
+
+{% endcomment %}

_portfolio/1_phd.md

@@ -1,7 +1,10 @@
 ---
-title: "PhD Project: The one-dimensional Long-Range Falikov-Kimball Model"
-excerpt: "I study a simplified model of electrons moving about in a crystal. <br/><img src='/images/phase_diagram.png'>"
+title: "PhD Project"
+subtitle: "The one-dimensional Long-Range Falikov-Kimball Model"
+excerpt: "I study a simplified model of electrons moving about in a crystal."
 collection: portfolio
+image: "phase_diagram.png"
+alt: "A colourful scientific figure from my work."
 ---
 ## 2018 - 2021 (expected)
 

_portfolio/2_msc.html

@@ -1,7 +1,10 @@
 ---
-title: "Msc Project: Imaging Magnetic Phenomena with Scanning Diamond Magnetometry"
-excerpt: "Built a 3D vector magnetometer in order to determine the axis of a defect in a nano-diamond. <br/><img src='/images/vector_magnet_angle_view.png' height='100'>"
+title: "Msc Project"
+subtitle: "Imaging Magnetic Phenomena with Scanning Diamond Magnetometry"
+excerpt: "Built a 3D vector magnetometer in order to determine the axis of a defect in a nano-diamond."
 collection: portfolio
+image: vector_magnet_angle_view.png
+alt: "A vector magnet that I designed."
 ---
 
 <h2> 2018 Msc Thesis, Natural Sciences,Trinity College, Cambridge </h2><br>

_portfolio/3_cern.md

@@ -1,7 +1,9 @@
 ---
 title: "CERN Summmer Studentship"
-excerpt: "I worked at CERN for 3 months as a summer student, helping to design a high volume electronic measurement process for new silicon sensors for the LHC. <br/><img src='/images/CERN_probes.png'>"
+excerpt: "I worked at CERN for 3 months as a summer student, helping to design a high volume electronic measurement process for new silicon sensors for the LHC."
 collection: portfolio
+image: CERN_probes.png
+alt: "An image of some probes on a silicon wafer."
 ---
 ## 2017, CMS HGCAL Sensor Characterisation, CERN