From 65ef7bdc55c22abed46fa0958bf969a49d8c6164 Mon Sep 17 00:00:00 2001 From: Will Long Date: Tue, 26 Mar 2019 13:23:47 -0500 Subject: [PATCH 1/2] fixed form macro handling --- dist/_macros/{forms.twig => forms.macro.twig} | 0 dist/_patterns/00-atoms/05-forms/00-text-fields.twig | 1 - 2 files changed, 1 deletion(-) rename dist/_macros/{forms.twig => forms.macro.twig} (100%) diff --git a/dist/_macros/forms.twig b/dist/_macros/forms.macro.twig similarity index 100% rename from dist/_macros/forms.twig rename to dist/_macros/forms.macro.twig diff --git a/dist/_patterns/00-atoms/05-forms/00-text-fields.twig b/dist/_patterns/00-atoms/05-forms/00-text-fields.twig index ef7eef8..02a8485 100644 --- a/dist/_patterns/00-atoms/05-forms/00-text-fields.twig +++ b/dist/_patterns/00-atoms/05-forms/00-text-fields.twig @@ -1,4 +1,3 @@ -{% import "@macros/forms.twig" as forms %}
{{ forms.input('Text Input') }} {{ forms.input('Password', 'password') }} From 1a2f1b56e0b19d8e875c6ac71c5777090fe88159 Mon Sep 17 00:00:00 2001 From: Will Long Date: Tue, 26 Mar 2019 13:24:13 -0500 Subject: [PATCH 2/2] fixed reference to parent template in article 2col template --- dist/_patterns/03-templates/03-article-2col.twig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dist/_patterns/03-templates/03-article-2col.twig b/dist/_patterns/03-templates/03-article-2col.twig index a34f775..7ed03b8 100644 --- a/dist/_patterns/03-templates/03-article-2col.twig +++ b/dist/_patterns/03-templates/03-article-2col.twig @@ -1,4 +1,4 @@ -{% extends "@templates/page-2col.twig" %} +{% extends "@templates/00-layouts/01-page-2col.twig" %} {% block main %}