From 4b60a4d211a557dd2e4b072b0688279a924f28d5 Mon Sep 17 00:00:00 2001 From: Jonah Aragon Date: Sat, 9 Nov 2019 12:42:13 -0600 Subject: [PATCH] Add team page (#1473) * Add team page * Add biographies Co-Authored-By: nitrohorse <1514352+nitrohorse@users.noreply.github.com> * Add links to navbar * Add trai_dep's bio * Add info about us and our mission * Update bios Co-Authored-By: Mikaela Suomalainen Co-Authored-By: Dan Arel * Replace contact page with about us page * Fix footer link * Make up bios for the lazy team members Plus, they are all more aesthetically pleasing for @danarel. * Update bio Co-Authored-By: Dawid Potocki * Update bio Co-Authored-By: Dawid Potocki * Apply suggestions from code review Co-Authored-By: Dawid Potocki Co-Authored-By: Mikaela Suomalainen --- _includes/footer.html | 4 +- _includes/head.html | 4 +- _includes/nav.html | 74 +++++++--------- _includes/team.html | 44 ++++++++++ assets/img/layout/shield.png | Bin 0 -> 33260 bytes assets/img/team/blacklight447.png | Bin 0 -> 23295 bytes assets/img/team/burung.jpg | Bin 0 -> 57362 bytes assets/img/team/danarel.jpg | Bin 0 -> 21620 bytes assets/img/team/dawid.png | Bin 0 -> 73483 bytes assets/img/team/dngray.png | Bin 0 -> 1537 bytes assets/img/team/jonah.png | Bin 0 -> 355547 bytes assets/img/team/mikaela.png | Bin 0 -> 285800 bytes assets/img/team/nitrohorse.jpg | Bin 0 -> 10812 bytes assets/img/team/trai_dep.jpg | Bin 0 -> 291421 bytes nginx/020-redirects.conf | 3 + pages/about.html | 140 ++++++++++++++++++++++++++++++ pages/contact.md | 26 ------ 17 files changed, 224 insertions(+), 71 deletions(-) create mode 100644 _includes/team.html create mode 100644 assets/img/layout/shield.png create mode 100644 assets/img/team/blacklight447.png create mode 100644 assets/img/team/burung.jpg create mode 100644 assets/img/team/danarel.jpg create mode 100644 assets/img/team/dawid.png create mode 100644 assets/img/team/dngray.png create mode 100644 assets/img/team/jonah.png create mode 100644 assets/img/team/mikaela.png create mode 100644 assets/img/team/nitrohorse.jpg create mode 100644 assets/img/team/trai_dep.jpg create mode 100644 pages/about.html delete mode 100644 pages/contact.md diff --git a/_includes/footer.html b/_includes/footer.html index edf5ffba..be325e5f 100644 --- a/_includes/footer.html +++ b/_includes/footer.html @@ -56,8 +56,8 @@
diff --git a/_includes/head.html b/_includes/head.html index e19585bf..7091ca06 100644 --- a/_includes/head.html +++ b/_includes/head.html @@ -26,7 +26,7 @@ - {% if page.url == "/" %} + {% if page.url == "/" or page.url == "/about/" %}