From df847559047ca22f7010c1d22fb5b4f4a471667b Mon Sep 17 00:00:00 2001 From: Eli Gladman Date: Thu, 28 Jan 2016 15:42:04 -0500 Subject: [PATCH] fixes #160 --- _assets/css/main.sass | 13 ++++++++----- _includes/jade/posts.jade | 22 +++++++++++++++++++--- index.jade | 2 +- 3 files changed, 28 insertions(+), 9 deletions(-) diff --git a/_assets/css/main.sass b/_assets/css/main.sass index 6db8d84b9..ddf984174 100644 --- a/_assets/css/main.sass +++ b/_assets/css/main.sass @@ -542,11 +542,14 @@ hr h5 display: inline text-transform: capitalize - &::after - content: "\f105" - font-family: FontAwesome - margin: 0 0.5em - color: $textColor + + a:not(:last-of-type) + h5::after + content: "\f105" + font-family: FontAwesome + margin: 0 0.5em + color: $textColor + diff --git a/_includes/jade/posts.jade b/_includes/jade/posts.jade index 20b391b1d..a7630a0b5 100644 --- a/_includes/jade/posts.jade +++ b/_includes/jade/posts.jade @@ -1,19 +1,35 @@ .section.posts .container + + {% if page.is_post %} .category-title - a(href='{{ site.baseurl }}/{{ post.categories | first }}') + + {% if post.categories contains 'announcements' %} + a(href='{{ site.baseurl }}/') + h5 {{ page.tags }} + {% else %} + a(href='{{ site.baseurl }}/{{ page.tags | first }}') h5 {{ page.tags }} + {% endif %} + a(href='{{ site.baseurl }}{{ post.url }}') h5 {{ page.title }} {% endif %} - {% if page.category %} + {% if page.category %} .category-title + + {% if post.categories contains 'announcements' %} a(href='{{ site.baseurl }}/') h5 {{ page.category }} - + {% else %} + a(href='{{ site.baseurl }}/{{ page.category }}') + h5 {{ page.category }} + {% endif %} + a + h5 page {{ paginator.page }} {% endif %} diff --git a/index.jade b/index.jade index 9571d402e..3325e54c4 100644 --- a/index.jade +++ b/index.jade @@ -2,5 +2,5 @@ layout: html/default title: Open Source Club category: announcements -alias: [/index.html, /club_email.html, /articles.html, /club_meetings.html, /mailinglist, /mailinglist/about.html, /mailinglist-info.html, /about/summer.html, /about.1.html] +alias: [/index.html, /club_email.html, /articles.html, /club_meetings.html, /mailinglist, /mailinglist/about.html, /mailinglist-info.html, /about/summer.html, /about.1.html, /announcements] ---