Skip to content
This repository has been archived by the owner on Apr 7, 2019. It is now read-only.

Fixes generation errors #22

Open
wants to merge 2 commits into
base: develop
Choose a base branch
from
Open

Fixes generation errors #22

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
65ef7bd
fixed form macro handling
kerasai Mar 26, 2019
1a2f1b5
fixed reference to parent template in article 2col template
kerasai Mar 26, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
0 dist/_macros/forms.twig → dist/_macros/forms.macro.twig
View file
Open in desktop
File renamed without changes.
1 change: 0 additions & 1 deletion dist/_patterns/00-atoms/05-forms/00-text-fields.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
{% import "@macros/forms.twig" as forms %}
Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Explicit import not necessary per https://github.com/pattern-lab/patternengine-php-twig#macros.

forms.twig renamed to forms.macro.twig per the macro extension defined in the config.yml.

<fieldset>
{{ forms.input('Text Input') }}
{{ forms.input('Password', 'password') }}
Expand Down
2 changes: 1 addition & 1 deletion dist/_patterns/03-templates/03-article-2col.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{% extends "@templates/page-2col.twig" %}
{% extends "@templates/00-layouts/01-page-2col.twig" %}
Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This reference is just incorrect.

Other includes within the template appear to be incorrect as well, but they do not prevent the generation from completing. May want to consider updating all of these, possibly using the pattern include partial syntax.

{% block main %}
<article class="article">
<header class="article-header">
Expand Down