diff --git a/_includes/news-item.html b/_includes/news-item.html index 7cfdb54..14fa635 100644 --- a/_includes/news-item.html +++ b/_includes/news-item.html @@ -14,7 +14,7 @@ {% if post.shortnews %} {{ post.content | remove: '

' | remove: '

' }} {% else %} -

{{ post.title }}

+
{{ post.title }}
{{ post.excerpt | remove: '

' | remove: '

' }}
Read more » diff --git a/_includes/person-image.html b/_includes/person-image.html index dbd1b5d..4b77d02 100644 --- a/_includes/person-image.html +++ b/_includes/person-image.html @@ -13,11 +13,17 @@ text-decoration hack is for Safari. We don't SVGs to be underlined. {% if person.image %} {% capture image %} - + {{ person.display_name }} {% endcapture %} {% else %} {% capture image %} - + + {{ person.display_name }}
-

{{ name }}

+
{{ name }}
{% if person.bio %}
{{person.bio}}
{% endif %} diff --git a/_includes/project-card.html b/_includes/project-card.html index 93d2160..926eb86 100644 --- a/_includes/project-card.html +++ b/_includes/project-card.html @@ -1,7 +1,13 @@ {% assign project = include.project %} -{% capture card-content %} +{% if project.link %} + {% assign proj-url = project.link %} +{% else %} + {% capture proj-url %}{{site.base}}{{project.url}}.html{% endcapture %} +{% endif %} + +
{% if project.image %} {% assign imgurl = project.image %} @@ -9,14 +15,26 @@ {% if init == "/" %} {% capture imgurl %}{{site.base}}{{project.image}}{% endcapture %} {% endif %} - {{project.title}} + + {{project.title}} + {% endif %} {% if project.notitle != true %} -

{{project.title}}

+

+ {{ project.title }} +

+ {% endif %} + {% if project.subtitle != null and project.subtitle != "" %} +
+ {{ project.subtitle }} +
{% endif %}
{{ project.description | markdownify }}
+ {% if project.no-link != true or project.link %} + Read more » + {% endif %}
{% if project.people %} {% endif %} -{% endcapture %} - -{% if project.link %} - {% assign proj-url = project.link %} -{% else %} - {% capture proj-url %}{{site.base}}{{project.url}}.html{% endcapture %} -{% endif %} - -{% if proj-url %} - -{% else %} -
- {{ card-content }} -
-{% endif %} +
diff --git a/_projects/longer-project.md b/_projects/longer-project.md index a5686e8..84644d5 100644 --- a/_projects/longer-project.md +++ b/_projects/longer-project.md @@ -1,10 +1,10 @@ --- title: Project with a Longer Title +subtitle: And a subtitle 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. + This project has a long title, but no other content. + Setting the `no-link` property means that there's no link. people: - storm @@ -14,30 +14,5 @@ people: - wolverine layout: project +no-link: true --- - -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/css/group.scss b/css/group.scss index cef6776..695febc 100644 --- a/css/group.scss +++ b/css/group.scss @@ -106,14 +106,6 @@ section { .card { - &.link:hover { border-color: $gray } - - > a { - color: inherit; - &:hover { text-decoration: none } - } - - .profile { height: 40px; width: 40px; @@ -135,6 +127,10 @@ section { .bio { color: $gray; } + + .person-name { + margin: 0; + } } .person-without-image {