From 23bd38aed7e3177328876326c459dc1fe8099ca3 Mon Sep 17 00:00:00 2001 From: Book Sadprasid <42843916+BookSadprasid@users.noreply.github.com> Date: Thu, 21 May 2020 20:50:09 -0300 Subject: [PATCH 1/2] Website Updates (#2) * Update navigation and styles * Add Roboto font, update header and about page styles --- .gitignore | 7 ++++++- _config.yml | 8 ++++---- _data/navigation.yml | 8 +++++--- _includes/author-profile.html | 2 +- _includes/head.html | 3 +++ _includes/masthead.html | 12 +++++++++--- _layouts/archive.html | 1 - _pages/about.md | 17 +++++++++++++++-- _pages/cv.md | 2 +- _pages/teaching.md | 18 ++++++++++++++++++ _pages/{teaching.html => teaching2.html} | 2 +- _sass/_archive.scss | 3 +++ _sass/_base.scss | 3 +++ _sass/_masthead.scss | 9 ++++++--- _sass/_page.scss | 1 - _sass/_variables.scss | 8 ++++---- images/scott.png | Bin 0 -> 57544 bytes 17 files changed, 79 insertions(+), 25 deletions(-) create mode 100644 _pages/teaching.md rename _pages/{teaching.html => teaching2.html} (88%) create mode 100644 images/scott.png diff --git a/.gitignore b/.gitignore index bd5d188..3300244 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,7 @@ -_site/ +# Node +node_modules +# Ruby +Gemfile.lock + +_site/ \ No newline at end of file diff --git a/_config.yml b/_config.yml index a279d1c..b6b4e23 100644 --- a/_config.yml +++ b/_config.yml @@ -10,8 +10,6 @@ locale : "en-CA" title : "Scott Bateman" title_separator : "-" name : &name "Scott Bateman" -first_name : "Scott" -last_name : "Bateman" description : &description "Associate Professor at University of New Brunswick" url : https://scottbateman.github.io # the base hostname & protocol for your site e.g. "https://mmistakes.github.io" baseurl : "" # the subpath of your site, e.g. "/blog" @@ -82,12 +80,14 @@ analytics: # Site Author author: + first_name : "Scott" + last_name : "Bateman" name : "Scott Bateman" - avatar : "scott.jpg" + avatar : "scott.png" bio : "Researcher in Human-Computer Interaction: collaboration, mixed reality, games/play, health technologies and other stuff." location : "Fredericton, NB" employer : "University of New Brunswick" - pubmed : + pubmed : googlescholar : "https://scholar.google.ca/citations?user=DV8i83MAAAAJ&hl=en&oi=ao" email : "scottb@unb.ca" researchgate : # example: "https://www.researchgate.net/profile/yourprofile" diff --git a/_data/navigation.yml b/_data/navigation.yml index 809acd3..25f5ace 100644 --- a/_data/navigation.yml +++ b/_data/navigation.yml @@ -6,8 +6,6 @@ main: #- title: "Talks" # url: /talks/ -# - title: "Teaching" -# url: /teaching/ # - title: "Portfolio" # url: /portfolio/ @@ -15,8 +13,12 @@ main: # - title: "Blog Posts" # url: /year-archive/ - - title: "CV" + - title: "Curriculum Vitae" url: /cv/ + - title: "Teaching" + url: /teaching/ + - title: "HCI Lab" + url: https://hcilab.github.io/ # - title: "Guide" # url: /markdown/ diff --git a/_includes/author-profile.html b/_includes/author-profile.html index b42ab52..7984fa3 100644 --- a/_includes/author-profile.html +++ b/_includes/author-profile.html @@ -15,7 +15,7 @@
-

{{ author.name }}

+ {% if author.bio %}

{{ author.bio }}

{% endif %}
diff --git a/_includes/head.html b/_includes/head.html index ffcc741..8525f66 100644 --- a/_includes/head.html +++ b/_includes/head.html @@ -6,6 +6,9 @@ + + + diff --git a/_includes/masthead.html b/_includes/masthead.html index 2f96a81..199f1b9 100644 --- a/_includes/masthead.html +++ b/_includes/masthead.html @@ -1,14 +1,20 @@ {% include base_path %} +{% if page.author and site.data.authors[page.author] %} + {% assign author = site.data.authors[page.author] %}{% else %}{% assign author = site.author %} +{% endif %} +