diff --git a/.gitignore b/.gitignore index 8e0a011..002da94 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ _site _includes/pubs.html +/test-deploy.sh diff --git a/_config.yml b/_config.yml index c1305ab..0f4d53d 100644 --- a/_config.yml +++ b/_config.yml @@ -11,12 +11,22 @@ permalink: /blog/:year/:month/:day/:title.html # Sections on the "people" page. roles: - - {key: faculty, name: Faculty} - - {key: staff, name: Staff} - - {key: postdoc, name: Researchers} - - {key: grad, name: Graduate Students} - - {key: collab, name: Collaborators} - - {key: alum, name: Alumni} + - key: faculty + name: Faculty + - key: staff + name: Staff + - key: postdoc + name: Researchers + - key: grad + name: Graduate Students + - key: ugrad + name: Undergraduate Students + - key: ugrad-alum + name: Past Undergraduate Students + - key: collab + name: Collaborators + - key: alum + name: Alumni # Number of news stories on the front page. front_page_news: 8 @@ -24,15 +34,18 @@ front_page_news: 8 # Base pathname for links. base: '' +# make pages for the _projects folder +collections: + projects: + output: true + # Navigation bar links. navigation: - - title: Home - link: / - - title: People - link: /people.html - - title: Research - link: /research/ - - title: Publications - link: /publications.html - - title: Code - link: /code.html + - title: Home + link: / + - title: Research + link: /research.html + - title: Publications + link: /publications.html + - title: Code + link: /code.html diff --git a/_data/people.yml b/_data/people.yml index 7d2e2d4..f5f9155 100644 --- a/_data/people.yml +++ b/_data/people.yml @@ -1,16 +1,30 @@ + +prof-a: + display_name: "Prof A" + role: faculty + +prof-b: + display_name: "Prof B" + role: faculty + +prof-c: + display_name: "Prof C" + role: faculty + profx: display_name: "Professor X" webpage: "http://en.wikipedia.org/wiki/Professor_X" github: profx role: faculty - bio: | - Professor X is the leader and founder of X-Men. -melody: + image: /img/people/prof-x.png + bio: Professor + +scott: display_name: "Scott Summers" webpage: "http://en.wikipedia.org/wiki/Cyclops_(comics)" role: staff - bio: | - Scott, also known as Cyclops, shoots lasers from his eyes, which makes him the perfect administrative assistant. + image: /img/people/scott.png + bio: aka Cyclops wolverine: display_name: "Wolverine" @@ -22,8 +36,126 @@ storm: display_name: "Storm" webpage: "http://en.wikipedia.org/wiki/Storm_%28Marvel_Comics%29" role: grad + image: /img/people/storm.png + +grad-a: + display_name: "Grad A" + role: grad + +grad-b: + display_name: "Graduate Student B With Long Name" + role: grad + +grad-c: + display_name: "Grad C" + role: grad -jean: - display_name: "Jean Grey" +grad-d: + display_name: "Grad D" + role: grad + +grad-e: + display_name: "Grad E" + role: grad + +grad-f: + display_name: "Grad F" + role: grad + +grad-g: + display_name: "Grad G" + role: grad + +grad-h: + display_name: "Grad H" + role: grad + +grad-i: + display_name: "Grad I" + role: grad + +alum-a: + display_name: "Alum A" role: alum bio: "Ph.D., 2013. Now at Microsoft Research." + +alum-b: + display_name: "Alum B With Way Longer Name" + role: alum + +alum-c: + display_name: "Alum C" + role: alum + webpage: "https://www.google.com" + +alum-d: + display_name: "Alum D" + role: alum + +alum-e: + display_name: "Alum E" + role: alum + +alum-f: + display_name: "Alum F" + role: alum + +alum-g: + display_name: "Alum G" + role: alum + +alum-h: + display_name: "Alum H" + role: alum + +alum-i: + display_name: "Alum I" + role: alum + +collab-a: + display_name: "Collaborator A" + role: collab + +collab-b: + display_name: "Collaborator B With Long Name" + role: collab + +collab-c: + display_name: "Collaborator C" + role: collab + +collab-d: + display_name: "Collaborator D" + role: collab + +collab-e: + display_name: "Collaborator E" + role: collab + +ugrad-a: + display_name: "Ugrad A" + role: ugrad + +ugrad-b: + display_name: "Ugrad Student B With Long Name" + role: ugrad + +ugrad-c: + display_name: "Ugrad C" + role: ugrad + +ugrad-d: + display_name: "Ugrad D" + role: ugrad + +ugrad-e: + display_name: "Ugrad E" + role: ugrad + +ugrad-alum-a: + display_name: "Past Ugrad A" + role: ugrad-alum + +ugrad-alum-b: + display_name: "Past Ugrad Student B With Long Name" + role: ugrad-alum diff --git a/_includes/news-item.html b/_includes/news-item.html new file mode 100644 index 0000000..7cfdb54 --- /dev/null +++ b/_includes/news-item.html @@ -0,0 +1,23 @@ + +{% assign item = include.item %} +{% if item.icon %} +{% assign icon = item.icon %} +{% assign class = "shortnews" %} +{% else %} +{% assign icon = "newspaper-o" %} +{% endif %} + +
  • + + {{ post.date | date: '%B %d, %Y' }} +
    + {% if post.shortnews %} + {{ post.content | remove: '

    ' | remove: '

    ' }} + {% else %} +

    {{ post.title }}

    + {{ post.excerpt | remove: '

    ' | remove: '

    ' }} +
    + Read more » + {% endif %} +
    +
    • diff --git a/_includes/person-image.html b/_includes/person-image.html new file mode 100644 index 0000000..dbd1b5d --- /dev/null +++ b/_includes/person-image.html @@ -0,0 +1,38 @@ + +{% assign person = include.person %} + +{% comment %} + +Usage: {% include person-image.html person=person %} + +Sizing of the SVG is done in a viewBox, and it's resized later in CSS. + +text-decoration hack is for Safari. We don't SVGs to be underlined. + +{% endcomment %} + +{% if person.image %} + {% capture image %} + + {% endcapture %} +{% else %} + {% capture image %} + + + + {{ person.display_name | slice: 0 }} + + + {% endcapture %} +{% endif %} + +{% if person.webpage %} + + {{ image }} + +{% else %} + {{ image }} +{% endif %} diff --git a/_includes/person.html b/_includes/person.html new file mode 100644 index 0000000..206a252 --- /dev/null +++ b/_includes/person.html @@ -0,0 +1,49 @@ + +{% assign person = include.person %} + +{% comment %} + +Usage: + +{% for item in site.data.people %} + {% assign person = item[1] %} + {% if person.role == role.key %} + {% include person.html person=person image=true %} + {% endif %} +{% endfor %} + +Use the image parameter to include or not include an image. + +Note that pl-0 just removes the left padding from the name part that is put +there by default by Bootstrap columns. + +{% endcomment %} + +{% if person.webpage %} + {% capture name %} + {{ person.display_name }} + {% endcapture %} +{% else %} + {% assign name = person.display_name %} +{% endif %} + +{% if include.image %} +
    +
    + {% include person-image.html person=person %} +
    +
    +

    {{ name }}

    + {% if person.bio %} +
    {{person.bio}}
    + {% endif %} +
    +
    +{% else %} +
    + {{ name }} + {% if person.bio %} + {{person.bio}} + {% endif %} +
    +{% endif %} diff --git a/_includes/project-card.html b/_includes/project-card.html new file mode 100644 index 0000000..93d2160 --- /dev/null +++ b/_includes/project-card.html @@ -0,0 +1,49 @@ + +{% assign project = include.project %} + +{% capture card-content %} +
    + {% if project.image %} + {% assign imgurl = project.image %} + {% capture init %}{{ project.image | slice: 0,1 }}{% endcapture %} + {% if init == "/" %} + {% capture imgurl %}{{site.base}}{{project.image}}{% endcapture %} + {% endif %} + {{project.title}} + {% endif %} + {% if project.notitle != true %} +

    {{project.title}}

    + {% endif %} +
    + {{ project.description | markdownify }} +
    +
    + {% if project.people %} +
    + {% for uname in project.people %} +
    + {% assign person = site.data.people[uname] %} + {% include person-image.html person=person %} +
    + {% endfor %} +
    + {% endif %} +{% endcapture %} + +{% if project.link %} + {% assign proj-url = project.link %} +{% else %} + {% capture proj-url %}{{site.base}}{{project.url}}.html{% endcapture %} +{% endif %} + +{% if proj-url %} +
    + + {{ card-content }} + +
    +{% else %} +
    + {{ card-content }} +
    +{% endif %} diff --git a/_includes/role-people.html b/_includes/role-people.html new file mode 100644 index 0000000..5a558d5 --- /dev/null +++ b/_includes/role-people.html @@ -0,0 +1,16 @@ + +{% assign role-key = include.role %} + +{% for role in site.roles %} + {% if role.key == role-key %} +

    {{ role.name }}

    +
    + {% for item in site.data.people %} + {% assign person = item[1] %} + {% if person.role == role.key %} + {% include person.html person=person image=include.image %} + {% endif %} + {% endfor %} +
    + {% endif %} +{% endfor %} diff --git a/_layouts/default.html b/_layouts/default.html index 760a200..bbbea64 100644 --- a/_layouts/default.html +++ b/_layouts/default.html @@ -1,55 +1,80 @@ - {{ site.name }}: {{ page.title }} - - - - + + + + +
    -
    - - - - -
    - - {% comment %}Liquid is sort of terrible! I think "!= true" is the - only way to do negation?{% endcomment %} - {% if page.notitle != true %} -

    {{ page.title }}

    - {% endif %} - - {{ content }} - -
    -

    - Illustrious Department - at the - University of - Example -

    -
    + +
    + + + + +
    + + {% if page.image %} + {{ page.title }} + {% endif %} + + {% if page.notitle != true %} +

    {{ page.title }}

    + {% endif %} + + {{ content }} + +
    +

    + Illustrious Department + at the + University of Example +

    +
    + src="{{ site.base }}/js/srcset-polyfill.js"> diff --git a/_layouts/post.html b/_layouts/post.html index 5dc8aa5..d9ad6bf 100644 --- a/_layouts/post.html +++ b/_layouts/post.html @@ -1,7 +1,7 @@ --- layout: default --- -

    {{ page.date | date_to_string }}

    +

    {{ page.date | date: '%B %d, %Y' }}

    {{ content }} diff --git a/_layouts/project.html b/_layouts/project.html new file mode 100644 index 0000000..09a4d6f --- /dev/null +++ b/_layouts/project.html @@ -0,0 +1,13 @@ +--- +layout: default +--- + +{{ content }} + +

    People

    +
    + {% for uname in page.people %} + {% assign person = site.data.people[uname] %} + {% include person.html person=person image=true%} + {% endfor %} +
    diff --git a/_posts/2014-05-14-test.md b/_posts/2014-05-14-test.md index e56316f..10d5989 100644 --- a/_posts/2014-05-14-test.md +++ b/_posts/2014-05-14-test.md @@ -1,5 +1,7 @@ --- layout: post shortnews: true +icon: newspaper-o --- + This is a short notice of something that happened recently. Just a news update blurb in no great detail. diff --git a/_posts/2014-05-25-anothertest.md b/_posts/2014-05-25-anothertest.md index faf09d9..bb23df7 100644 --- a/_posts/2014-05-25-anothertest.md +++ b/_posts/2014-05-25-anothertest.md @@ -1,7 +1,9 @@ --- layout: post title: "A Full Blog Post" +icon: star-o --- + Unlike a short news post, a blog post has its own page and lots of text. Text text text. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. diff --git a/_projects/a-project.md b/_projects/a-project.md new file mode 100644 index 0000000..f110dd7 --- /dev/null +++ b/_projects/a-project.md @@ -0,0 +1,43 @@ +--- +title: A Project + +description: | + Lorem ipsum dolor sit amet, consectetur adipiscing elit. Ut hendrerit blandit + varius. Pellentesque habitant morbi tristique senectus et netus et malesuada + fames ac turpis egestas. + +people: + - storm + - profx + - grad-b + - scott + - wolverine + +layout: project +--- + +Proin massa augue, eleifend non ultricies eget, feugiat ut nisl. Fusce at +aliquet justo, id elementum lacus. Praesent eleifend tempus molestie. Nunc +vulputate sed tortor a ultrices. Nullam blandit hendrerit nisi, at suscipit +augue ultricies quis. Nulla tincidunt rhoncus nisl sed consectetur. Phasellus +dapibus, leo in varius tempus, nibh velit tincidunt lacus, ut porta eros ex et +eros. Ut diam purus, sagittis vitae cursus eu, molestie eget turpis. Sed +consectetur magna in posuere faucibus. Morbi nibh eros, blandit ut vehicula ac, +pellentesque ut urna. + +Maecenas scelerisque ut enim non convallis. Mauris ut nisl vitae mi dictum +mollis. Pellentesque iaculis lacinia nisl viverra laoreet. Integer ac lacus quis +elit varius mollis et ultrices tortor. Aliquam id dolor cursus, sagittis arcu +tincidunt, scelerisque nisi. Morbi scelerisque feugiat mi in faucibus. Maecenas +suscipit aliquet est et efficitur. Nullam sed purus nec nulla placerat ultrices +ac at ipsum. Mauris a imperdiet eros. + +Aenean malesuada tellus nulla, ut ultrices purus dictum et. Nunc non eleifend +nulla, ut luctus nulla. Nulla et accumsan odio. Fusce libero nisl, rutrum ac +risus sit amet, interdum feugiat eros. Morbi semper scelerisque magna vel +malesuada. Curabitur in blandit orci. Cras eu tincidunt odio. Sed consectetur +nunc purus, id pharetra felis fermentum vitae. Sed rhoncus lacus lacus. Aenean a +ante et quam viverra pharetra interdum id ligula. Vestibulum lobortis ipsum ac +risus sagittis, non dapibus metus finibus. Quisque efficitur felis sed felis +luctus, non egestas ex dapibus. Sed pharetra gravida augue, id posuere nunc +fringilla eget. diff --git a/_projects/big-project.md b/_projects/big-project.md new file mode 100644 index 0000000..6994871 --- /dev/null +++ b/_projects/big-project.md @@ -0,0 +1,51 @@ +--- +title: Big Project + +description: | + This project has a lot of people working on it!! + It also has some `Mark` _down_ + +people: + - storm + - profx + - grad-a + - grad-b + - grad-c + - grad-d + - scott + - wolverine + - ugrad-a + - ugrad-b + - ugrad-c + - ugrad-d + +layout: project +--- + +## A Header + +Proin massa augue, eleifend non ultricies eget, feugiat ut nisl. Fusce at +aliquet justo, id elementum lacus. Praesent eleifend tempus molestie. Nunc +vulputate sed tortor a ultrices. Nullam blandit hendrerit nisi, at suscipit +augue ultricies quis. Nulla tincidunt rhoncus nisl sed consectetur. Phasellus +dapibus, `leo` in varius tempus, nibh velit tincidunt lacus, ut porta eros ex et +eros. Ut diam purus, sagittis vitae cursus eu, molestie eget turpis. Sed +consectetur magna in posuere faucibus. Morbi nibh eros, blandit ut vehicula ac, +pellentesque ut urna. + +Maecenas _scelerisque ut enim non convallis_. Mauris ut nisl vitae mi dictum +mollis. Pellentesque iaculis lacinia nisl viverra laoreet. Integer ac lacus quis +elit varius mollis et ultrices tortor. Aliquam id dolor cursus, sagittis arcu +tincidunt, scelerisque nisi. Morbi scelerisque feugiat mi in faucibus. Maecenas +suscipit aliquet est et efficitur. Nullam sed purus nec nulla placerat ultrices +ac at ipsum. Mauris a imperdiet eros. + +Aenean malesuada tellus nulla, ut ultrices purus dictum et. Nunc non eleifend +nulla, ut luctus nulla. Nulla et accumsan odio. Fusce libero nisl, rutrum ac +risus sit amet, interdum feugiat eros. Morbi semper scelerisque magna vel +malesuada. Curabitur in blandit orci. Cras eu tincidunt odio. Sed consectetur +nunc purus, id pharetra felis fermentum vitae. Sed rhoncus lacus lacus. Aenean a +ante et quam viverra pharetra interdum id ligula. Vestibulum lobortis ipsum ac +risus sagittis, non dapibus metus finibus. Quisque efficitur felis sed felis +luctus, non egestas ex dapibus. Sed pharetra gravida augue, id posuere nunc +fringilla eget. diff --git a/_projects/logo-project.md b/_projects/logo-project.md new file mode 100644 index 0000000..3f73a8c --- /dev/null +++ b/_projects/logo-project.md @@ -0,0 +1,27 @@ +--- +title: Logo Project + +notitle: true + +description: | + This project has a sweet logo! + +people: + - storm + - grad-b + - ugrad-c + +layout: project +image: "https://upload.wikimedia.org/wikipedia/commons/thumb/d/d4/Xmencomic-logo.svg/2000px-Xmencomic-logo.svg.png" +--- + +Some preliminary text. + +## header + +Maecenas _scelerisque ut enim non convallis_. Mauris ut nisl vitae mi dictum +mollis. Pellentesque iaculis lacinia nisl viverra laoreet. Integer ac lacus quis +elit varius mollis et ultrices tortor. Aliquam id dolor cursus, sagittis arcu +tincidunt, scelerisque nisi. Morbi scelerisque feugiat mi in faucibus. Maecenas +suscipit aliquet est et efficitur. Nullam sed purus nec nulla placerat ultrices +ac at ipsum. Mauris a imperdiet eros. diff --git a/_projects/longer-project.md b/_projects/longer-project.md new file mode 100644 index 0000000..a5686e8 --- /dev/null +++ b/_projects/longer-project.md @@ -0,0 +1,43 @@ +--- +title: Project with a Longer Title + +description: | + Lorem ipsum dolor sit amet, consectetur adipiscing elit. Ut hendrerit blandit + varius. Pellentesque habitant morbi tristique senectus et netus et malesuada + fames ac turpis egestas. + +people: + - storm + - profx + - grad-b + - scott + - wolverine + +layout: project +--- + +Proin massa augue, eleifend non ultricies eget, feugiat ut nisl. Fusce at +aliquet justo, id elementum lacus. Praesent eleifend tempus molestie. Nunc +vulputate sed tortor a ultrices. Nullam blandit hendrerit nisi, at suscipit +augue ultricies quis. Nulla tincidunt rhoncus nisl sed consectetur. Phasellus +dapibus, leo in varius tempus, nibh velit tincidunt lacus, ut porta eros ex et +eros. Ut diam purus, sagittis vitae cursus eu, molestie eget turpis. Sed +consectetur magna in posuere faucibus. Morbi nibh eros, blandit ut vehicula ac, +pellentesque ut urna. + +Maecenas scelerisque ut enim non convallis. Mauris ut nisl vitae mi dictum +mollis. Pellentesque iaculis lacinia nisl viverra laoreet. Integer ac lacus quis +elit varius mollis et ultrices tortor. Aliquam id dolor cursus, sagittis arcu +tincidunt, scelerisque nisi. Morbi scelerisque feugiat mi in faucibus. Maecenas +suscipit aliquet est et efficitur. Nullam sed purus nec nulla placerat ultrices +ac at ipsum. Mauris a imperdiet eros. + +Aenean malesuada tellus nulla, ut ultrices purus dictum et. Nunc non eleifend +nulla, ut luctus nulla. Nulla et accumsan odio. Fusce libero nisl, rutrum ac +risus sit amet, interdum feugiat eros. Morbi semper scelerisque magna vel +malesuada. Curabitur in blandit orci. Cras eu tincidunt odio. Sed consectetur +nunc purus, id pharetra felis fermentum vitae. Sed rhoncus lacus lacus. Aenean a +ante et quam viverra pharetra interdum id ligula. Vestibulum lobortis ipsum ac +risus sagittis, non dapibus metus finibus. Quisque efficitur felis sed felis +luctus, non egestas ex dapibus. Sed pharetra gravida augue, id posuere nunc +fringilla eget. diff --git a/_projects/short-inactive-project.md b/_projects/short-inactive-project.md new file mode 100644 index 0000000..2cbd0d1 --- /dev/null +++ b/_projects/short-inactive-project.md @@ -0,0 +1,16 @@ +--- +title: Short Inactive Project +status: inactive + +description: | + This project is quite brief: it only has a description and an external link. + It's inactive so it should only appear on the "Research" page. + +people: + - storm + - grad-e + - collab-a + +layout: project +link: "https://en.wikipedia.org/wiki/X-Men" +--- diff --git a/bib/bib-url-check.pl b/bib/bib-url-check.pl deleted file mode 100755 index abaa3fd..0000000 --- a/bib/bib-url-check.pl +++ /dev/null @@ -1,40 +0,0 @@ -#!/usr/bin/perl -# -# Check a .bib file for unretrievable URLs. -# -# Usage: -# bib-url-check.pl sampa-pubs.bib -# -or- -# < sampa-pubs.bib bib-url-check.pl > urlreport.txt -# - - -use strict; -use LWP::UserAgent; - -# http://daringfireball.net/2010/07/improved_regex_for_matching_urls -my $urlrx = qr{(?i)\b((?:https?://|www\d{0,3}[.]|[a-z0-9.\-]+[.][a-z]{2,4}/)(?:[^\s()<>]+|\(([^\s()<>]+|(\([^\s()<>]+\)))*\))+(?:\(([^\s()<>]+|(\([^\s()<>]+\)))*\)|[^\s`!()\[\]{};:'".,<>?«»“”‘’]))}o; - -my $ua = LWP::UserAgent->new( - ssl_opts => { verify_hostname => 0 }, - ); -$ua->timeout(10); -$ua->env_proxy; -my $response; - -my %done = {}; - -while (<>) { - if (m/$urlrx/g) { - next if $done{$1}; - - $response = $ua->get($1); - if ($response->is_success) { - print "OK (", $response->code, "): line $.: $1\n"; - } else { - print "FAIL (", $response->code, "): line $.: $1\n"; - } - $done{$1} = 1; - sleep 1; - } -} diff --git a/bib/pubs.bib b/bib/pubs.bib index 7b0d9c4..6807d8d 100644 --- a/bib/pubs.bib +++ b/bib/pubs.bib @@ -3,5 +3,6 @@ title = {Awesome Publication}, booktitle = {International Conference on Awesome Research}, year = 2014, - month = 5 + month = 5, + url = {https://www.asdfasdf.asdfasdf.asdfasdfads} } diff --git a/blog.html b/blog.html new file mode 100644 index 0000000..09b6729 --- /dev/null +++ b/blog.html @@ -0,0 +1,10 @@ +--- +layout: default +title: Blog +--- + + diff --git a/blog/blog.xml b/blog/blog.xml deleted file mode 100644 index 577b678..0000000 --- a/blog/blog.xml +++ /dev/null @@ -1,30 +0,0 @@ ---- -layout: nil ---- - - - - {{ site.name }} - - - {{ site.time | date_to_xmlschema }} - {{ site.url }}{{ site.base }}/ - - the Sampa group - - - {% for post in site.posts limit:20 %} - - {% if post.shortnews %} - {{ post.date | date_to_long_string }} - - {% else %} - {{ post.title }} - - {% endif %} - {{ post.date | date_to_xmlschema }} - {{ site.url }}{{ site.base }}{{ post.url }} - {{ post.content | xml_escape }} - - {% endfor %} - diff --git a/blog/index.html b/blog/index.html deleted file mode 100644 index c903f7a..0000000 --- a/blog/index.html +++ /dev/null @@ -1,21 +0,0 @@ ---- -layout: default -title: News and Blog ---- - - -

    See archived news posts.

    diff --git a/css/group.css b/css/group.css deleted file mode 100644 index 774f437..0000000 --- a/css/group.css +++ /dev/null @@ -1,126 +0,0 @@ -/* Space out content a bit */ -body { - padding-top: 20px; - padding-bottom: 20px; -} - -/* Everything but the jumbotron gets side spacing for mobile first views */ -.header, -.footer { - padding-left: 15px; - padding-right: 15px; -} - -/* Custom page header */ -.header { - border-bottom: 1px solid #e5e5e5; -} - -/* Custom page footer */ -.footer { - padding-top: 19px; - color: #777; - border-top: 1px solid #e5e5e5; - text-align: center; - font-size: 0.8em; -} -.footer p { - margin: 0.1em 0; -} -.footer a:link, .footer a:visited { - color: #777; -} - -/* Customize container */ -@media (min-width: 768px) { - .container { - max-width: 730px; - } -} -.container-narrow > hr { - margin: 30px 0; -} - -/* Jumbotron */ -.jumbotron { - text-align: center; - border-bottom: 1px solid #e5e5e5; -} -.jumbotron p { - font-size: 15px; -} -.jumbotron { - padding-top: 18px; - padding-bottom: 10px; -} - -/* Group logo */ -#logo { - width: 154px; - height: 35px; - margin: 2px 0 8px 0; -} - -/* Responsive: Portrait tablets and up */ -@media screen and (min-width: 768px) { - /* Remove the padding we set earlier */ - .header, - .footer { - padding-left: 0; - padding-right: 0; - } - /* Space out the masthead */ - .header { - margin-bottom: 30px; - } - /* Remove the bottom border on the jumbotron for visual effect */ - .jumbotron { - border-bottom: 0; - } -} - -/* Slightly better-looking header on mobile. */ -@media screen and (max-width: 767px) { - .nav-pills { - display: block; - margin: 0 auto 1em; - } - #logo { - display: block; - clear: both; - margin: 1em auto; - } -} - -/* Photo */ -.inset-image { - width: 60%; - margin: 0 auto; -} - -/* People list */ -dl.people dd { - margin-bottom: 1em; -} - -/* Front page news. */ -ul.news .date { - color: #999; - font-weight: bold; - display: block; -} -ul.news > li { - margin-top: 1em; -} -ul.news .shortnews .date { - float: left; - margin-right: 1em; -} -ul.news .bloglink a { - font-size: 1.4em; -} - -.illustration { - float: right; - margin: 0 0 1em 1em; -} diff --git a/css/group.scss b/css/group.scss new file mode 100644 index 0000000..cef6776 --- /dev/null +++ b/css/group.scss @@ -0,0 +1,151 @@ +--- +--- + +$gray: #999; +$light-gray: #EEE; + +/* Space out content a bit */ +body { + padding-top: 20px; +} + +.header { + border-bottom: 1px solid $light-gray; + padding-bottom: 10px; + margin-bottom: 20px; + text-align: center; +} + +.footer { + /* padding-top: 19px; */ + color: $gray; + border-top: 1px solid $light-gray; + text-align: center; + font-size: 0.8em; + + a:link, a:visited { + color: $gray; + } +} + +.fa { + color: $gray; +} +a > .fa { + // make sure that font-awesome icons are underlined in links + display: inline; +} + +/* /\* Customize container *\/ */ +/* @media (min-width: 768px) { */ +/* .container { */ +/* max-width: 730px; */ +/* } */ +/* } */ + +/* Jumbotron */ +.jumbotron { + text-align: center; + padding-top: 1.5em; + padding-bottom: 0.5em; + font-size: 125% +} + +/* Group logo */ +#logo { + width: 154px; + height: 35px; + margin: 2px 0 8px 0; +} + +/* Front page news. */ +ul.news { + + .date { + color: $gray; + font-weight: bold; + } + + > li { + margin-top: 1em; + } +} + +@media (min-width: 576px) { + .project-people { column-count: 2 } + .card-columns { column-count: 2 } +} + +@media (min-width: 768px) { + .role.grad { column-count: 2 } + .project-people { column-count: 3 } + .card-columns { column-count: 3 } +} + +.title img { + max-width: 50%; +} + +section { + margin-bottom: 2em; +} + +.profile { + object-fit: cover; // makes sure it's cropped +} + +.noprofile { + circle { + fill: $light-gray; + } + text { + font-weight: 700; + fill: white; + } +} + +.card { + + &.link:hover { border-color: $gray } + + > a { + color: inherit; + &:hover { text-decoration: none } + } + + + .profile { + height: 40px; + width: 40px; + margin: 3px; + } + + .card-footer { padding: 0.5em } +} + +.person { + + margin-bottom: 10px; + + .profile { + height: 70px; + width: 70px; + } + + .bio { + color: $gray; + } +} + +.person-without-image { + margin: 0; + + .bio { + margin-left: 1em; + } +} + +svg { + // make the alignment just like img from bootstrap's reboot.scss + vertical-align: middle; +} diff --git a/img/people/prof-x.png b/img/people/prof-x.png new file mode 100644 index 0000000..d4aba68 Binary files /dev/null and b/img/people/prof-x.png differ diff --git a/img/people/scott.png b/img/people/scott.png new file mode 100644 index 0000000..d263d3b Binary files /dev/null and b/img/people/scott.png differ diff --git a/img/people/storm.png b/img/people/storm.png new file mode 100644 index 0000000..368416e Binary files /dev/null and b/img/people/storm.png differ diff --git a/index.html b/index.html index 8b8b1a6..3874128 100644 --- a/index.html +++ b/index.html @@ -2,31 +2,69 @@ layout: default title: Home notitle: true + +# groups of columns of {roles: list, width: num, image: bool} +role-tables: +- - roles: [faculty, postdoc, staff] + width: 4 + image: true + - roles: [grad] + width: 8 + image: true +- - roles: [collab, ugrad, ugrad-alum] + width: 5 + image: false + - roles: [alum] + width: 7 + image: false + --- +
    -

    - The Awesome Research Group at Example U does all sorts of - research. Here is a place where we tell you exactly what that is! -

    +

    + The Awesome Research Group at Example U does all sorts of + research. Here is a place where we tell you exactly what that is! +

    -

    News

    - -{% assign numposts = site.posts | size %} -{% if numposts >= site.front_page_news %} -

    Older posts…

    -{% endif %} + + +
    +

    Research

    +
    + {% for p in site.projects %} + {% if p.status != "inactive" %} + {% include project-card.html project=p %} + {% endif %} + {% endfor %} +
    +
    + +
    +

    People

    + {% for role-table in page.role-tables %} +
    + {% for role-column in role-table %} +
    + {% for role in role-column.roles %} + {% include role-people.html role=role image=role-column.image %} + {% endfor %} +
    + {% endfor %} +
    + {% endfor %} +
    diff --git a/people.html b/people.html index a271c05..8340039 100644 --- a/people.html +++ b/people.html @@ -1,29 +1,32 @@ --- layout: default title: People + +picture-role-groups: +- {roles: [faculty, postdoc, staff], width: 4} +- {roles: [grad], width: 8} + +no-picture-role-groups: +- {roles: [collab, ugrad, ugrad-alum], width: 5} +- {roles: [alum], width: 7} --- -{% for role in site.roles %} -

    {{ role.name }}

    -
    - {% for item in site.data.people %} - {% assign person = item[1] %} - {% if person.role == role.key %} -
    - {% if person.webpage %} - - {% endif %} - {{ person.display_name }} - {% if person.webpage %} - - {% endif %} -
    -
    - {% if person.bio %} - {{ person.bio | markdownify }} - {% endif %} -
    - {% endif %} - {% endfor %} -
    -{% endfor %} +
    + {% for role-group in page.picture-role-groups %} +
    + {% for role in role-group.roles %} + {% include role-people.html role=role image=true %} + {% endfor %} +
    + {% endfor %} +
    + +
    + {% for role-group in page.no-picture-role-groups %} +
    + {% for role in role-group.roles %} + {% include role-people.html role=role image=false %} + {% endfor %} +
    + {% endfor %} +
    diff --git a/research.html b/research.html new file mode 100644 index 0000000..9a4dc40 --- /dev/null +++ b/research.html @@ -0,0 +1,10 @@ +--- +layout: default +title: Research Projects +--- + +
    + {% for p in site.projects %} + {% include project-card.html project=p %} + {% endfor %} +
    diff --git a/research/index.md b/research/index.md deleted file mode 100644 index 17def3a..0000000 --- a/research/index.md +++ /dev/null @@ -1,15 +0,0 @@ ---- -layout: default -title: Research Projects -projects: - - link: project/ - name: An Exciting project - summary: This will never work. ---- - -Our research is awesome. - -### An Exciting project -Read about it [here][project]. - -[project]: project/index.html \ No newline at end of file diff --git a/research/project/index.md b/research/project/index.md deleted file mode 100644 index 8351fbe..0000000 --- a/research/project/index.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -layout: default -title: An Exciting Project ---- -We've done some great work on this project! \ No newline at end of file