From 62a80507b0c0f64931f505f41a344cb6665617fc Mon Sep 17 00:00:00 2001
From: Kevin Lin <kevinl@cs.uw.edu>
Date: Mon, 13 Jul 2020 17:07:36 -0700
Subject: [PATCH] Use real staffer data, add image height, width
---
_config.yml | 2 ++
_layouts/staffer.html | 2 +-
_sass/custom/staffer.scss | 1 +
_staffers/evil-kevin.md | 9 ---------
_staffers/kevin-lin.md | 10 ++++++++++
_staffers/kevin.md | 9 ---------
_staffers/more-evil-kevin.md | 9 ---------
_staffers/really-evil-kevin.md | 9 ---------
assets/images/{kevin.jpg => kevin-lin.jpg} | Bin
9 files changed, 14 insertions(+), 37 deletions(-)
delete mode 100644 _staffers/evil-kevin.md
create mode 100644 _staffers/kevin-lin.md
delete mode 100644 _staffers/kevin.md
delete mode 100644 _staffers/more-evil-kevin.md
delete mode 100644 _staffers/really-evil-kevin.md
rename assets/images/{kevin.jpg => kevin-lin.jpg} (100%)
diff --git a/_config.yml b/_config.yml
index ff02003..b9d3d8c 100644
--- a/_config.yml
+++ b/_config.yml
@@ -48,7 +48,9 @@ defaults:
type: staffers
values:
layout: staffer
+ height: 300
subpath: '/assets/images/'
+ width: 300
- scope:
path: ''
type: modules
diff --git a/_layouts/staffer.html b/_layouts/staffer.html
index 6a5e894..1bcfdd8 100644
--- a/_layouts/staffer.html
+++ b/_layouts/staffer.html
@@ -1,6 +1,6 @@
<div class="staffer">
{% if page.photo %}
- <img class="staffer-image" src="{{ site.baseurl }}{{ page.subpath }}{{ page.photo }}" alt="">
+ <img class="staffer-image" src="{{ site.baseurl }}{{ page.subpath }}{{ page.photo }}" alt="" width="{{ page.width }}" height="{{ page.height }}">
{% endif %}
<div>
<h3 class="staffer-name">
diff --git a/_sass/custom/staffer.scss b/_sass/custom/staffer.scss
index 18630e0..12bd3ab 100644
--- a/_sass/custom/staffer.scss
+++ b/_sass/custom/staffer.scss
@@ -6,6 +6,7 @@
border-radius: 50%;
height: 100px;
margin-right: $sp-4;
+ width: auto;
}
p,
diff --git a/_staffers/evil-kevin.md b/_staffers/evil-kevin.md
deleted file mode 100644
index ff5264f..0000000
--- a/_staffers/evil-kevin.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-name: Evil Kevin
-role: Teaching Assistant
-email: me@example.com
-website: https://kevinl.info
-photo: kevin.jpg
----
-
-I like teaching Computer Science!
diff --git a/_staffers/kevin-lin.md b/_staffers/kevin-lin.md
new file mode 100644
index 0000000..2c97f3c
--- /dev/null
+++ b/_staffers/kevin-lin.md
@@ -0,0 +1,10 @@
+---
+name: Kevin Lin
+role: Instructor
+email: kevinl@cs.uw.edu
+website: https://kevinl.info
+photo: kevin-lin.jpg
+pronouns: he/him
+---
+
+[Schedule a meeting](https://kevinl.info/meet/){: .btn .btn-outline }
diff --git a/_staffers/kevin.md b/_staffers/kevin.md
deleted file mode 100644
index 7759a4f..0000000
--- a/_staffers/kevin.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-name: Kevin Lin
-role: Instructor
-email: me@example.com
-website: https://kevinl.info
-photo: kevin.jpg
----
-
-[Schedule an appointment](#){: .btn .btn-outline }
diff --git a/_staffers/more-evil-kevin.md b/_staffers/more-evil-kevin.md
deleted file mode 100644
index a416b3f..0000000
--- a/_staffers/more-evil-kevin.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-name: More Evil Kevin
-role: Teaching Assistant
-email: me@example.com
-website: https://kevinl.info
-photo: kevin.jpg
----
-
-I like teaching Computer Science!
diff --git a/_staffers/really-evil-kevin.md b/_staffers/really-evil-kevin.md
deleted file mode 100644
index 377d089..0000000
--- a/_staffers/really-evil-kevin.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-name: Really Evil Kevin
-role: Teaching Assistant
-email: me@example.com
-website: https://kevinl.info
-photo: kevin.jpg
----
-
-I like teaching Computer Science!
diff --git a/assets/images/kevin.jpg b/assets/images/kevin-lin.jpg
similarity index 100%
rename from assets/images/kevin.jpg
rename to assets/images/kevin-lin.jpg
--
GitLab