From 71c249d25be62ddc471914eb624799aaf6f558e7 Mon Sep 17 00:00:00 2001 From: Oliver Davies Date: Tue, 7 May 2019 17:18:56 +0100 Subject: [PATCH 1/3] Update main wrapper classes --- source/_layouts/base.html.twig | 6 +++--- source/_layouts/page.html.twig | 16 ++++++++++++---- 2 files changed, 15 insertions(+), 7 deletions(-) diff --git a/source/_layouts/base.html.twig b/source/_layouts/base.html.twig index 654c912..dda282a 100644 --- a/source/_layouts/base.html.twig +++ b/source/_layouts/base.html.twig @@ -1,13 +1,13 @@ - + {% include 'meta' %} - + -
+
{% include 'banner' %} {% block content_wrapper %} diff --git a/source/_layouts/page.html.twig b/source/_layouts/page.html.twig index ea9e129..c8a4428 100644 --- a/source/_layouts/page.html.twig +++ b/source/_layouts/page.html.twig @@ -1,11 +1,19 @@ {% extends 'base' %} {% block content_wrapper %} -
-

{{ page.title }}

+
+
+

+ {% block title %}{{ page.title }}{% endblock %} +

-
- {% block content %}{% endblock %} + {% block content_wrapper_inner %} +
+ {% block content %}{% endblock %} +
+ {% endblock %} + + {% block content_bottom %}{% endblock %}
{% endblock %} From 4423f3702d9436cd6d1e5cf7bb34bdf0b45c4a5c Mon Sep 17 00:00:00 2001 From: Oliver Davies Date: Tue, 7 May 2019 17:21:34 +0100 Subject: [PATCH 2/3] Remove body_classes block --- source/_layouts/base.html.twig | 2 +- source/_layouts/front.html.twig | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/source/_layouts/base.html.twig b/source/_layouts/base.html.twig index dda282a..4d9f911 100644 --- a/source/_layouts/base.html.twig +++ b/source/_layouts/base.html.twig @@ -7,7 +7,7 @@ -
+
{% include 'banner' %} {% block content_wrapper %} diff --git a/source/_layouts/front.html.twig b/source/_layouts/front.html.twig index fdf8f67..9c11d90 100644 --- a/source/_layouts/front.html.twig +++ b/source/_layouts/front.html.twig @@ -1,3 +1 @@ {% extends 'base' %} - -{% block body_classes 'tw-h-full tw-flex tw-flex-col' %} From b09f37bf79ccb9a222c342b848d17ce05fecdafc Mon Sep 17 00:00:00 2001 From: Oliver Davies Date: Tue, 7 May 2019 17:24:10 +0100 Subject: [PATCH 3/3] Replace front template with default --- source/_layouts/{front.html.twig => default.html.twig} | 0 source/index.html.twig | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename source/_layouts/{front.html.twig => default.html.twig} (100%) diff --git a/source/_layouts/front.html.twig b/source/_layouts/default.html.twig similarity index 100% rename from source/_layouts/front.html.twig rename to source/_layouts/default.html.twig diff --git a/source/index.html.twig b/source/index.html.twig index 74c661d..ec2ce79 100644 --- a/source/index.html.twig +++ b/source/index.html.twig @@ -1,5 +1,5 @@ --- -layout: front +layout: default twitter: url: https://twitter.com/drupalcampbris update_text: Session submissions are now open!