scottbateman · scottbateman · May 23, 2020 · May 7, 2020 · May 21, 2020 · May 22, 2020
diff --git a/.gitignore b/.gitignore
@@ -1,2 +1,7 @@
-_site/
+# Node
+node_modules
 
+# Ruby
+Gemfile.lock
+
+_site/
diff --git a/.jekyll-metadata b/.jekyll-metadata
diff --git a/Gemfile b/Gemfile
@@ -1,4 +1,5 @@
 source "https://rubygems.org"
+ruby RUBY_VERSION
 
 # Hello! This is where you manage which Jekyll version is used to run.
 # When you want to use a different version, change it below, save the
@@ -24,4 +25,4 @@ group :jekyll_plugins do
   gem "jekyll-feed"
   gem 'jekyll-sitemap'
   gem 'hawkins'
-end
+end
diff --git 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           : 
+  location         :
+  employer         : "University of New Brunswick, Fredericton"
+  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
@@ -6,17 +6,19 @@ main:
   #- title: "Talks"
   #  url: /talks/    
 
-#   - title: "Teaching"
-#     url: /teaching/    
 
 #   - title: "Portfolio"
 #     url: /portfolio/
 
 #   - 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
@@ -15,24 +15,23 @@
   </div>
 
   <div class="author__content">
-    <h3 class="author__name">{{ author.name }}</h3>
     {% if author.bio %}<p class="author__bio">{{ author.bio }}</p>{% endif %}
   </div>
 
   <div class="author__urls-wrapper">
     <button class="btn btn--inverse">Follow</button>
     <ul class="author__urls social-icons">
-      {% if author.location %}
-        <li><i class="fa fa-fw fa-map-marker" aria-hidden="true"></i> {{ author.location }}</li>
-      {% endif %}
       {% if author.employer %}
-        <li><i class="fa fa-fw fa-map-marker" aria-hidden="true"></i> {{ author.employer }}</li>
+        <li>
+            <img src="/images/location.svg" alt="location">
+            <p>{{ author.employer }}</p>
+        </li>
       {% endif %}
       {% if author.uri %}
         <li><a href="{{ author.uri }}"><i class="fas fa-link" aria-hidden="true"></i> {{ site.data.ui-text[site.locale].website_label | default: "Website" }}</a></li>
       {% endif %}
       {% if author.email %}
-        <li><a href="mailto:{{ author.email }}"><i class="fas fa-envelope" aria-hidden="true"></i> {{ site.data.ui-text[site.locale].email_label | default: "Email" }}</a></li>
+        <li><a href="mailto:{{ author.email }}"><img src="/images/email.svg" alt="email">{{ site.data.ui-text[site.locale].email_label | default: "Email" }}</a></li>
       {% endif %}
       {% if author.keybase %}
         <li><a href="https://keybase.io/{{ author.keybase }}"><i class="fas fa-key" aria-hidden="true"></i> Keybase</a></li>
@@ -41,7 +40,7 @@ <h3 class="author__name">{{ author.name }}</h3>
         <li><a href="{{ author.researchgate }}"><i class="fab fa-researchgate" aria-hidden="true"></i> ResearchGate</a></li>
       {% endif %}
       {% if author.twitter %}
-        <li><a href="https://twitter.com/{{ author.twitter }}"><i class="fab fa-twitter-square" aria-hidden="true"></i> Twitter</a></li>
+        <li><a href="https://twitter.com/{{ author.twitter }}"><img src="/images/twitter.svg" alt="twitter">Twitter</a></li>
       {% endif %}
       {% if author.facebook %}
         <li><a href="https://www.facebook.com/{{ author.facebook }}"><i class="fab fa-facebook-square" aria-hidden="true"></i> Facebook</a></li>
@@ -50,7 +49,7 @@ <h3 class="author__name">{{ author.name }}</h3>
         <li><a href="https://plus.google.com/+{{ author.google_plus }}"><i class="fab fa-google-plus" aria-hidden="true"></i> Google+</a></li>
       {% endif %}
       {% if author.linkedin %}
-        <li><a href="https://www.linkedin.com/in/{{ author.linkedin }}"><i class="fab fa-linkedin" aria-hidden="true"></i> LinkedIn</a></li>
+        <li><a href="https://www.linkedin.com/in/{{ author.linkedin }}"><img src="/images/linkedin.svg" alt="linkedin">LinkedIn</a></li>
       {% endif %}
       {% if author.xing %}
         <li><a href="https://www.xing.com/profile/{{ author.xing }}"><i class="fab fa-xing-square" aria-hidden="true"></i> XING</a></li>
@@ -65,7 +64,7 @@ <h3 class="author__name">{{ author.name }}</h3>
         <li><a href="https://bitbucket.org/{{ author.bitbucket }}"><i class="fab fa-bitbucket" aria-hidden="true"></i> Bitbucket</a></li>
       {% endif %}
       {% if author.github %}
-        <li><a href="https://github.com/{{ author.github }}"><i class="fab fa-github" aria-hidden="true"></i> Github</a></li>
+        <li><a href="https://github.com/{{ author.github }}"><img src="/images/github.svg" alt="github">Github</a></li>
       {% endif %}
       {% if author.stackoverflow %}
         <li><a href="https://www.stackoverflow.com/users/{{ author.stackoverflow }}"><i class="fa fab -fw fa-stack-overflow" aria-hidden="true"></i> Stackoverflow</a></li>
@@ -104,7 +103,7 @@ <h3 class="author__name">{{ author.name }}</h3>
         <li><a href="https://vine.co/u/{{ author.vine }}"><i class="fab fa-vine" aria-hidden="true"></i> Vine</a></li>
       {% endif %}
       {% if author.googlescholar %}
-        <li><a href="{{ author.googlescholar }}"><i class="fas fa-graduation-cap"></i> Google Scholar</a></li>
+        <li><a href="{{ author.googlescholar }}"><img src="/images/scholar.svg" alt="scholar"> Google Scholar</a></li>
       {% endif %}
       {% if author.pubmed %}
         <li><a href="{{ author.pubmed }}"><i class="ai ai-pubmed-square ai-fw"></i> PubMed</a></li>

diff --git a/_includes/head.html b/_includes/head.html
@@ -6,6 +6,9 @@
 
 <link href="{% if site.atom_feed.path %}{{ site.atom_feed.path }}{% else %}{{ base_path }}/feed.xml{% endif %}" type="application/atom+xml" rel="alternate" title="{{ site.title }} Feed">
 
+<!-- Fonts -->
+<link href="https://fonts.googleapis.com/css2?family=Roboto:wght@400;700;900&display=swap" rel="stylesheet">
+
 <!-- http://t.co/dKP3o1e -->
 <meta name="HandheldFriendly" content="True">
 <meta name="MobileOptimized" content="320">

diff --git 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 %}
+
 <div class="masthead">
   <div class="masthead__inner-wrap">
     <div class="masthead__menu">
       <nav id="site-nav" class="greedy-nav">
         <button><div class="navicon"></div></button>
         <ul class="visible-links">
-          <li class="masthead__menu-item masthead__menu-item--lg">
-            <a href="{{ base_path }}/"><span class="masthead__first_name">{{ site.first_name }}</span>
-            <span class="masthead__last_name">{{ site.last_name }}</span></a>
+          <li class="masthead__menu-item masthead__menu-item--lg masthead__menu-item--title">
+            <a href="{{ base_path }}/">
+              <span class="masthead__first_name">{{ author.first_name }}</span>
+              <span class="masthead__last_name">{{ author.last_name }}</span>
+            </a>
           </li>
           {% for link in site.data.navigation.main %}
             {% if link.url contains 'http' %}

diff --git a/_includes/sidebar.html b/_includes/sidebar.html
@@ -10,7 +10,7 @@
         {% if s.image contains "://" %}
           "{{ s.image }}"
         {% else %}
-          "{{ s.image | prepend: "/images/" | prepend: base_path }}"
+          "{{ s.image | prepend: "/images/" }}"
         {% endif %}
         alt="{% if s.image_alt %}{{ s.image_alt }}{% endif %}">
       {% endif %}

diff --git a/_layouts/archive.html b/_layouts/archive.html
@@ -17,7 +17,6 @@
 
   <div class="archive">
     {% unless page.header.overlay_color or page.header.overlay_image %}
-      <h1 class="page__title">{{ page.title }}</h1>
     {% endunless %}
     {{ content }}
   </div>

diff --git a/_pages/about.md b/_pages/about.md
@@ -1,11 +1,24 @@
 ---
+layout: archive
 permalink: /
-title: "About me"
+
+# Page Title
+title: "About"
+
 excerpt: "About me"
 author_profile: true
-redirect_from: 
+redirect_from:
   - /about/
   - /about.html
 ---
 
-I am an Associate Professor and the Director of the [HCI Lab](https://hcilab.github.io). My research in Human-Computer Interaction focusses on cooperative work, collaborative play, and technology that promotes health and supports therapy. This work has often leveraged mixed reality, mobile, game and web technologies to explore and study new designs.
+### About Scott Bateman.
+
+Dr. Scott Bateman is the director of the Human-Computer Interaction Lab, where his research is motivated by designing and building technology that works best for people. His work focuses on novel input interactions, visual analytics, computer-based collaboration, and games for learning and health. He joined UNB in the summer of 2015, after 2.5 years as at the University of Prince Edward Island. He received a PhD and Master’s in Computer Science from the University of Saskatchewan, and has worked as a researcher with Microsoft Research, IBM Watson Research, the University of Calgary and the National College of Ireland. Dr. Bateman has been an Associate Editor for several leading international journals and conferences. A frequent collaborator with industry, the HCI Lab has ongoing collaborations with several companies, and has completed several industry R+D projects supported by NBIF, NSERC and NRC.
+
+### Research Interest.
+
+- Human-Computer Interaction
+- Information Visualization and Visual Analytics
+- Computer Supported Collaboration
+- Games and Gamification
diff --git a/_pages/cv.md b/_pages/cv.md
@@ -1,6 +1,6 @@
 ---
 layout: archive
-title: "CV"
+title: "Curriculum Vitae"
 permalink: /cv/
 author_profile: true
 redirect_from:

diff --git a/_pages/teaching.md b/_pages/teaching.md
@@ -0,0 +1,18 @@
+---
+layout: archive
+title: "Teaching"
+permalink: /teaching
+author_profile: true
+---
+
+{% include base_path %}
+
+Other his management of University of New Brunswick’s HCI Lab and reserach supervision, Dr. Bateman teaches courses in user interface development, user expereince design, HCI and research methods.
+
+Current and Past Teaching
+======
+* CS1073 Introduction to Computer Programing I
+* CS2053 Introduction to Game Development
+* CS3035 Building User Interfaces
+* CS6065 Interactive Human-Centered System
+* CS6905 Mixed Reality
diff --git a/_pages/teaching.html → _pages/teaching2.html b/_pages/teaching.html → _pages/teaching2.html
@@ -1,7 +1,7 @@
 ---
 layout: archive
 title: "Teaching"
-permalink: /teaching/
+permalink: /teaching2/
 author_profile: true
 ---
 

diff --git a/_sass/_archive.scss b/_sass/_archive.scss
@@ -3,6 +3,7 @@
    ========================================================================== */
 
 .archive {
+  padding-top: 24px;
   margin-bottom: 2em;
 
   @include breakpoint($medium) {
@@ -90,6 +91,8 @@
    ========================================================================== */
 
 .list__item {
+  margin-bottom: 30px;
+
   @include breakpoint($medium) {
     padding-right: $right-sidebar-width-narrow;
   }

diff --git a/_sass/_base.scss b/_sass/_base.scss
@@ -35,10 +35,13 @@ h1 {
 
 h2 {
   font-size: $type-size-4;
+  margin-top: 0;
 }
 
 h3 {
   font-size: $type-size-5;
+  margin-top: 0;
+  margin-bottom: 30px;
 }
 
 h4 {

diff --git a/_sass/_masthead.scss b/_sass/_masthead.scss
@@ -4,13 +4,12 @@
 
 .masthead {
   position: relative;
-  border-bottom: 1px solid $border-color;
   -webkit-animation: intro 0.3s both;
           animation: intro 0.3s both;
   -webkit-animation-delay: 0.15s;
           animation-delay: 0.15s;
   z-index: 20;
-    
+
   &__inner-wrap {
     @include container;
     @include clearfix;
@@ -32,7 +31,7 @@
 }
 
 .masthead__first_name {
-   font-weight: normal;  
+   font-weight: normal;
 }
 
 .masthead__menu {
@@ -54,4 +53,8 @@
     padding-right: 2em;
     font-weight: 700;
   }
+
+  &--title {
+    text-transform: uppercase;
+  }
 }
diff --git a/_sass/_navigation.scss b/_sass/_navigation.scss
@@ -212,7 +212,15 @@
         font-weight: bold;
 
         a {
-          margin-left: 0;
+          margin-left: 26px;
+          margin-right: 60px;
+        }
+
+        @include breakpoint($medium) {
+          a {
+            margin-left: 13px;
+            margin-right: -4px;
+          }
         }
       }
 

diff --git a/_sass/_page.scss b/_sass/_page.scss
@@ -5,7 +5,6 @@
 #main {
   @include container;
   @include clearfix;
-  margin-top: 2em;
   padding-left: 1em;
   padding-right: 1em;
   animation: intro 0.3s both;

diff --git a/_sass/_reset.scss b/_sass/_reset.scss
@@ -10,10 +10,6 @@ html {
   background-color: $background-color;
   font-size: 16px;
 
-  @include breakpoint($medium) {
-    font-size: 18px;
-  }
-
   -webkit-text-size-adjust: 100%;
   -ms-text-size-adjust: 100%;
 }

diff --git a/_sass/_sidebar.scss b/_sass/_sidebar.scss
@@ -87,7 +87,6 @@
 
     @include breakpoint($large) {
       padding: 5px;
-      border: 1px solid $border-color;
     }
   }
 }
@@ -117,11 +116,12 @@
 }
 .sidebar .author__name {
   font-family: $sans-serif;
-  font-size: $type-size-5;
+  font-size: $type-size-6;
 }
 
 .author__bio {
   margin: 0;
+  text-align: center;
 
   @include breakpoint($large) {
     margin-top: 10px;
@@ -216,7 +216,20 @@
   }
 
   li {
-    white-space: nowrap;
+    display: flex;
+    white-space: break-spaces;
+    align-items: flex-start;
+    margin-bottom: 16px;
+    min-height: 28px;
+  }
+
+  img {
+    width: auto;
+    margin-right: 8px;
+  }
+
+  p, a {
+    margin: 0;
   }
 
   a {