diff --git a/bakerydemo/static/css/main.css b/bakerydemo/static/css/main.css
index 755063c..d2332c4 100644
--- a/bakerydemo/static/css/main.css
+++ b/bakerydemo/static/css/main.css
@@ -239,8 +239,7 @@ nav {
}
.nav-pills>li.active>a, .nav-pills>li.active>a:focus, .nav-pills>li.active>a:hover,
-.nav-pills>li.active, .nav-pills>li:hover, .breadcrumb>li+li:hover:before,
-.nav>li>a:focus, .nav>li>a:hover {
+.nav-pills>li.active, .nav-pills>li:hover, .nav>li>a:focus, .nav>li>a:hover {
color: #d4566b;
background-color: transparent;
border-top: 1px solid #d4566b;
@@ -491,10 +490,32 @@ li.has-submenu a.allow-toggle {
padding-left: 0;
}
+.breadcrumb-container {
+ /*background-color: rgba(21, 38, 44, 0.8);*/
+ background: linear-gradient(to right, rgba(21,38,44,0.8) 0%,rgba(0,0,0,0.9) 100%);
+ position: relative;
+ z-index: 3;
+}
+.breadcrumb-container + content > .hero {
+ margin-top: -36px;
+}
.breadcrumb {
background-color: transparent;
+ color: #ccc;
font-family: 'Lato', sans-serif;
font-size: 14px;
+ margin-bottom: 0px;
+ padding-left: 0px;
+}
+.breadcrumb a, .breadcrumb .active {
+ color: #ccc;
+}
+.breadcrumb .active {
+ font-weight: bold;
+}
+.breadcrumb a:hover {
+ color: #fff;
+ text-decoration: none;
}
.breadcrumb>li+li:before {
content: "\00BB";
diff --git a/bakerydemo/templates/404.html b/bakerydemo/templates/404.html
index 107e725..3599fc5 100644
--- a/bakerydemo/templates/404.html
+++ b/bakerydemo/templates/404.html
@@ -4,8 +4,8 @@
{% block body_class %}template-404{% endblock %}
-{% block content-header %}
+{% block content %}
Page not found
Sorry, this page could not be found.
-{% endblock content-header %}
+{% endblock content %}
diff --git a/bakerydemo/templates/base.html b/bakerydemo/templates/base.html
index eac853b..53ca901 100755
--- a/bakerydemo/templates/base.html
+++ b/bakerydemo/templates/base.html
@@ -19,18 +19,16 @@
{% include "includes/messages.html" %}
{% endblock messages %}
-
- {% block content-header %}
- {% endblock content-header %}
- {% block breadcrumbs %}
- {% breadcrumbs %}
- {# breadcrumbs is defined in base/templatetags/navigation_tags.py #}
- {% endblock breadcrumbs %}
+{% block breadcrumbs %}
+ {% breadcrumbs %}
+ {# breadcrumbs is defined in base/templatetags/navigation_tags.py #}
+{% endblock breadcrumbs %}
- {% block content-body %}
- {% endblock content-body %}
-
+
+ {% block content %}
+ {% endblock content %}
+
diff --git a/bakerydemo/templates/base/about_page.html b/bakerydemo/templates/base/about_page.html
index 4d05b1a..da6b1fa 100644
--- a/bakerydemo/templates/base/about_page.html
+++ b/bakerydemo/templates/base/about_page.html
@@ -1,10 +1,8 @@
{% extends "base.html" %}
{% load wagtailimages_tags %}
-{% block content-header %}
+{% block content %}
{% include "base/include/header.html" %}
-{% endblock content-header %}
-{% block content-body %}
{{ page.body }}
-{% endblock content-body %}
+{% endblock content %}
diff --git a/bakerydemo/templates/base/form_page.html b/bakerydemo/templates/base/form_page.html
index 0291a89..f0e1a35 100644
--- a/bakerydemo/templates/base/form_page.html
+++ b/bakerydemo/templates/base/form_page.html
@@ -1,15 +1,13 @@
{% extends "base.html" %}
{% load wagtailcore_tags %}
-{% block content-header %}
+{% block content %}
{{ page.title }}
{{ page.intro|richtext }}
-{% endblock content-header %}
-{% block content-body %}
-{% endblock content-body %}
+{% endblock content %}
diff --git a/bakerydemo/templates/base/form_page_landing.html b/bakerydemo/templates/base/form_page_landing.html
index 84a08b0..7bc5c6b 100644
--- a/bakerydemo/templates/base/form_page_landing.html
+++ b/bakerydemo/templates/base/form_page_landing.html
@@ -1,13 +1,8 @@
{% extends "base.html" %}
{% load wagtailcore_tags %}
-{% block content-header %}
+{% block content %}
{{ page.title }}
-{% endblock content-header %}
-{% block breadcrumbs %}
-{% endblock breadcrumbs %}
-
-{% block content-body %}
{{ page.thank_you_text|richtext }}
-{% endblock content-body %}
\ No newline at end of file
+{% endblock content %}
\ No newline at end of file
diff --git a/bakerydemo/templates/base/gallery_page.html b/bakerydemo/templates/base/gallery_page.html
index b24dcd4..a768fa6 100644
--- a/bakerydemo/templates/base/gallery_page.html
+++ b/bakerydemo/templates/base/gallery_page.html
@@ -1,7 +1,7 @@
{% extends "base.html" %}
{% load wagtailimages_tags gallery_tags %}
-{% block content-header %}
+{% block content %}
{% image self.image fill-1920x600 as hero_img %}
-{% endblock content-header %}
-{% block content-body %}
-{% endblock content-body %}
+{% endblock content %}
diff --git a/bakerydemo/templates/base/home_page.html b/bakerydemo/templates/base/home_page.html
index 4d05b1a..604f59e 100644
--- a/bakerydemo/templates/base/home_page.html
+++ b/bakerydemo/templates/base/home_page.html
@@ -1,10 +1,7 @@
{% extends "base.html" %}
{% load wagtailimages_tags %}
-{% block content-header %}
- {% include "base/include/header.html" %}
-{% endblock content-header %}
+{% block content %}
-{% block content-body %}
{{ page.body }}
-{% endblock content-body %}
+{% endblock content %}
diff --git a/bakerydemo/templates/blog/blog_index_page.html b/bakerydemo/templates/blog/blog_index_page.html
index 79af4f0..544daf2 100644
--- a/bakerydemo/templates/blog/blog_index_page.html
+++ b/bakerydemo/templates/blog/blog_index_page.html
@@ -1,11 +1,9 @@
{% extends "base.html" %}
{% load wagtailimages_tags %}
-{% block content-header %}
+{% block content %}
{% include "base/include/header.html" %}
-{% endblock content-header %}
-{% block content-body %}
-{% endblock content-body %}
+{% endblock content %}
diff --git a/bakerydemo/templates/blog/blog_page.html b/bakerydemo/templates/blog/blog_page.html
index 7eafa9e..cdbfe0b 100644
--- a/bakerydemo/templates/blog/blog_page.html
+++ b/bakerydemo/templates/blog/blog_page.html
@@ -1,7 +1,7 @@
{% extends "base.html" %}
{% load navigation_tags wagtailimages_tags %}
-{% block content-header %}
+{% block content %}
{% image self.image fill-1920x600 as hero_img %}
-{% endblock content-header %}
-{% block content-body %}
-{% endblock content-body %}
+{% endblock content %}
diff --git a/bakerydemo/templates/breads/bread_page.html b/bakerydemo/templates/breads/bread_page.html
index 99ae817..e8cb799 100644
--- a/bakerydemo/templates/breads/bread_page.html
+++ b/bakerydemo/templates/breads/bread_page.html
@@ -1,15 +1,13 @@
{% extends "base.html" %}
{% load wagtailimages_tags %}
-{% block content-header %}
+{% block content %}
{{ page.title }}
-{% endblock content-header %}
-{% block content-body %}
{{ page.origin }}
{{ page.bread_type }}
{{ page.body }}
-{% endblock content-body %}
+{% endblock content %}
diff --git a/bakerydemo/templates/breads/breads_index_page.html b/bakerydemo/templates/breads/breads_index_page.html
index 776e906..325de57 100644
--- a/bakerydemo/templates/breads/breads_index_page.html
+++ b/bakerydemo/templates/breads/breads_index_page.html
@@ -1,12 +1,7 @@
{% extends "base.html" %}
{% load wagtailimages_tags %}
-{% block content-header %}
- {% include "base/include/header.html" %}
-{% endblock content-header %}
-
-{% block content-body %}
-
+{% block content %}
{{ page.introduction}}
{% for bread in resources %}
@@ -42,4 +37,4 @@
{% endif %}
-{% endblock content-body %}
+{% endblock content %}
diff --git a/bakerydemo/templates/locations/location_page.html b/bakerydemo/templates/locations/location_page.html
index ee7c6bc..7e97cea 100644
--- a/bakerydemo/templates/locations/location_page.html
+++ b/bakerydemo/templates/locations/location_page.html
@@ -10,8 +10,7 @@
{% endblock head-extra %}
-
-{% block content-header %}
+{% block content %}
{# @TODO This is identical to the header within blog_page.html. We should create an include #}
{% image self.image fill-1920x600 as hero_img %}
@@ -31,9 +30,7 @@
-{% endblock content-header %}
-{% block content-body %}
@@ -111,4 +108,4 @@
-{% endblock content-body %}
+{% endblock content %}
diff --git a/bakerydemo/templates/locations/locations_index_page.html b/bakerydemo/templates/locations/locations_index_page.html
index e826df7..a0ded6c 100644
--- a/bakerydemo/templates/locations/locations_index_page.html
+++ b/bakerydemo/templates/locations/locations_index_page.html
@@ -1,7 +1,7 @@
{% extends "base.html" %}
{% load wagtailcore_tags navigation_tags wagtailimages_tags %}
-{% block content-header %}
+{% block content %}
-{% endblock content-header %}
-{% block content-body %}
{% for location in locations %}
@@ -32,4 +30,4 @@
{% endfor %}
-{% endblock content-body %}
+{% endblock content %}
diff --git a/bakerydemo/templates/search/search_results.html b/bakerydemo/templates/search/search_results.html
index 0843f2f..a46287d 100644
--- a/bakerydemo/templates/search/search_results.html
+++ b/bakerydemo/templates/search/search_results.html
@@ -3,13 +3,11 @@
{% block title %}Search{% if search_results %} results{% endif %}{% endblock %}
-{% block content-header %}
+{% block content %}
Search results
-{% endblock content-header %}
-{% block content-body %}
{% if search_results %}
You searched
{% if request.GET.query %} for “{{ request.GET.query }}”{% endif %}