From 07a25e31a2efc36e80d59de845b7da1182aca83a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Moritz=20=C2=BBmo=2E=C2=AB=20Sauer?= Date: Fri, 3 Apr 2015 16:02:40 +0200 Subject: [PATCH] Moved Breadcrumb Navigation into _includes/masthead.html Breadcrumb must me called before the image caption otherwise it looks really ugly. --- _includes/masthead.html | 78 +++++++++++++++++++++++++++++------------ 1 file changed, 56 insertions(+), 22 deletions(-) diff --git a/_includes/masthead.html b/_includes/masthead.html index 5b4fb58..13cbbe2 100644 --- a/_includes/masthead.html +++ b/_includes/masthead.html @@ -10,6 +10,12 @@ +{% if page.breadcrumb == true %} +{% include breadcrumb.html %} +{% endif %} + + + {% elsif page.header.title %} @@ -22,6 +28,10 @@ +{% if page.breadcrumb == true %} +{% include breadcrumb.html %} +{% endif %} + {% if page.header.caption_url && page.header.caption %}
{{ page.header.caption }} @@ -34,6 +44,8 @@ + + {% elsif page.header.image_fullwidth %}
@@ -46,6 +58,10 @@
+{% if page.breadcrumb == true %} +{% include breadcrumb.html %} +{% endif %} + {% if page.header.caption_url && page.header.caption %}
{{ page.header.caption }} @@ -58,6 +74,8 @@ + + {% elsif page.header.pattern %}
@@ -68,27 +86,9 @@
- {% if page.header.caption_url && page.header.caption %} -
- {{ page.header.caption }} -
- {% elsif page.header.caption %} -
- {{ page.header.caption }} -
- {% endif %} - - - -{% elsif page.header.background-color %} - -
-
-
- {{ site.title }} -
-
-
+{% if page.breadcrumb == true %} +{% include breadcrumb.html %} +{% endif %} {% if page.header.caption_url && page.header.caption %}
@@ -102,6 +102,40 @@ -{% elsif page.header == no %} + + +{% elsif page.header.background-color %} + +
+
+
+ {{ site.title }} +
+
+
+ +{% if page.breadcrumb == true %} +{% include breadcrumb.html %} +{% endif %} + +{% if page.header.caption_url && page.header.caption %} + +{% elsif page.header.caption %} +
+ {{ page.header.caption }} +
+{% endif %} + + + + + +{% elsif page.header = no %} + +{% if page.breadcrumb == true %} +{% include breadcrumb.html %} +{% endif %} {% endif %}