From 3defaf676c2b4f49d74c3e17749318c25a7cd71c Mon Sep 17 00:00:00 2001 From: Oliver Davies Date: Sun, 19 Nov 2017 15:03:07 +0000 Subject: [PATCH] Add breadcrumbs for talks and posts --- assets/less/main.less | 5 +++++ source/_includes/nav.html.twig | 2 +- source/_includes/svg/chevron-right.twig | 7 +++++++ source/_layouts/default.html.twig | 1 + source/_layouts/post.html.twig | 20 ++++++++++++++++++++ source/_layouts/talk.html.twig | 22 ++++++++++++++++++++++ 6 files changed, 56 insertions(+), 1 deletion(-) create mode 100644 source/_includes/svg/chevron-right.twig diff --git a/assets/less/main.less b/assets/less/main.less index 4e6231f6..f02a58b5 100644 --- a/assets/less/main.less +++ b/assets/less/main.less @@ -58,7 +58,12 @@ main ul { @apply .pl-4; } +svg { + fill: currentColor; +} + @import "components/listing"; +@import "components/navbar"; @import "components/post"; @import "components/talk"; @import "components/talks-table"; diff --git a/source/_includes/nav.html.twig b/source/_includes/nav.html.twig index 963edbdd..652592a9 100644 --- a/source/_includes/nav.html.twig +++ b/source/_includes/nav.html.twig @@ -1,4 +1,4 @@ -
+
diff --git a/source/_includes/svg/chevron-right.twig b/source/_includes/svg/chevron-right.twig new file mode 100644 index 00000000..d34a8981 --- /dev/null +++ b/source/_includes/svg/chevron-right.twig @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/source/_layouts/default.html.twig b/source/_layouts/default.html.twig index af494fd7..589b4d8c 100644 --- a/source/_layouts/default.html.twig +++ b/source/_layouts/default.html.twig @@ -26,6 +26,7 @@ {% include 'nav' %} + {% block breadcrumb %}{% endblock %}
diff --git a/source/_layouts/post.html.twig b/source/_layouts/post.html.twig index 732b471f..0bab6b99 100644 --- a/source/_layouts/post.html.twig +++ b/source/_layouts/post.html.twig @@ -1,5 +1,25 @@ {% extends 'default' %} +{% block breadcrumb %} +
+
+
    +
  • + Home + {% include "svg/chevron-right" with { class: 'text-grey-light mx-1', style: "height: 20px" } %} +
    • +
  • + Blog + {% include "svg/chevron-right" with { class: 'text-grey-light mx-1', style: "height: 20px" } %} +
    • +
  • + {{ page.title }} +
    • +
+
+
+{% endblock %} + {% block content_wrapper %} {% include 'post/header' %} {% include 'post/intro-image' %} diff --git a/source/_layouts/talk.html.twig b/source/_layouts/talk.html.twig index bb312ed1..d78bcbd8 100644 --- a/source/_layouts/talk.html.twig +++ b/source/_layouts/talk.html.twig @@ -1,7 +1,29 @@ {% extends 'page' %} + {% block breadcrumb %} +
+
+
    +
  • + Home + {% include "svg/chevron-right" with { class: 'text-grey-light mx-1', style: "height: 20px" } %} +
    • +
  • + Talks + {% include "svg/chevron-right" with { class: 'text-grey-light mx-1', style: "height: 20px" } %} +
    • +
  • + {{ page.title }} +
    • +
+
+
+{% endblock %} + {% block content_wrapper %}
+

Abstract

+ {% block content %}{% endblock %}