Merge pull request #14 from pattern-lab/develop

bmuenzenmeyer · web-flow · commit d9cadb35d7e2 · 2018-07-15T21:48:30.000-05:00
Namespaces
diff --git 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,4 @@
-{% import "forms.twig" as forms %}
+{% import "@macros/forms.twig" as forms %}
 <fieldset>
     {{ forms.input('Text Input') }}
     {{ forms.input('Password', 'password') }}
diff --git a/dist/_patterns/01-molecules/00-text/00-byline.twig b/dist/_patterns/01-molecules/00-text/00-byline.twig
@@ -1 +1 @@
-<div class="byline">by {{ author.first_name }} {{ author.last_name }}</div>
+<div class="byline">by {{ author.first_name }} {{ author.last_name }}</div>
diff --git a/dist/_patterns/01-molecules/02-blocks/00-media-block.twig b/dist/_patterns/01-molecules/02-blocks/00-media-block.twig
@@ -1,11 +1,11 @@
 <div class="block block-thumb">
     <a href="{{ url }}" class="b-inner">
 		<div class="b-thumb">
-			{% include "atoms-square" %}
+			{% include "@atoms/04-images/03-square.twig" %}
 		</div>
 		<div class="b-text">
 			<h2 class="b-title">{{ headline.short }}</h2>
 			<p>{{ excerpt.medium }}</p>
 		</div>
 	</a>
-</div>
+</div>
diff --git a/dist/_patterns/01-molecules/02-blocks/02-block-hero.twig b/dist/_patterns/01-molecules/02-blocks/02-block-hero.twig
@@ -1,10 +1,10 @@
 <div class="block block-hero">
 	<a href="{{ url }}" class="b-inner">
 		<div class="b-thumb">
-			{% include "atoms-landscape-16x9" %} 
+			{% include "@atoms/04-images/02-landscape-16x9.twig" %}
 		</div>
 		<div class="b-text">
 			<h2 class="b-title">{{ headline.medium }}</h2>
 		</div>
 	</a>
-</div>
+</div>
diff --git a/dist/_patterns/01-molecules/02-blocks/03-block-thumb-headline.twig b/dist/_patterns/01-molecules/02-blocks/03-block-thumb-headline.twig
@@ -1,10 +1,10 @@
 <div class="block block-thumb">
 	<a href="{{ url }}" class="b-inner">
 		<div class="b-thumb">
-			{% include "atoms-square" %}
+			{% include "@atoms/04-images/03-square.twig" %}
 		</div>
 		<div class="b-text">
 			<h2 class="b-title">{{ title }}</h2>
 		</div>
 	</a>
-</div>
+</div>
diff --git a/dist/_patterns/01-molecules/02-blocks/05-block-inset.twig b/dist/_patterns/01-molecules/02-blocks/05-block-inset.twig
@@ -1,10 +1,10 @@
 <div class="block block-inset">
     <a href="{{ url }}" class="inner">
 		<div class="b-thumb">
-			{% include "atoms-landscape-4x3" %} 
+			{% include "@atoms/04-images/01-landscape-4x3.twig" %}
 		</div>
 		<div class="b-text">
 			<h2 class="headline">{{ headline.short }}</h2>
 		</div>
 	</a>
-</div>
+</div>
diff --git a/dist/_patterns/01-molecules/03-media/00-figure-with-caption.twig b/dist/_patterns/01-molecules/03-media/00-figure-with-caption.twig
@@ -1,4 +1,4 @@
 <figure>
-	{% include "atoms-landscape-4x3" %}
+	{% include "@atoms/04-images/01-landscape-4x3.twig" %}
 	<figcaption>This is an example of an image with a caption. Photo captions, also known as cutlines, are a few lines of text used to explain or elaborate on published photographs.</figcaption>
-</figure>
+</figure>
diff --git a/dist/_patterns/01-molecules/06-components/02-single-comment.twig b/dist/_patterns/01-molecules/06-components/02-single-comment.twig
@@ -1,9 +1,9 @@
 <li class="comment-container">
 	<div class="comment-meta">
-		{% include "atoms-avatar" %}
+		{% include "@atoms/04-images/04-avatar.twig" %}
 		<h4 class="comment-name"><a href="#">{{ name.first }} {{ name.last }}</a></h4>
 	</div>
 	<div class="comment-text">
 		<p>{{ description }}</p>
 	</div>
-</li>
+</li>
diff --git a/dist/_patterns/02-organisms/00-global/00-header.twig b/dist/_patterns/02-organisms/00-global/00-header.twig
@@ -1,9 +1,9 @@
 <!-- Begin .header -->
 <header class="header cf" role="banner">
-	{% include "atoms-logo" %}
+	{% include "@atoms/04-images/00-logo.twig" %}
 	<a href="#search-form" class="nav-toggle nav-toggle-search icon-search"><span class="is-vishidden">Search</span></a>
 	<a href="#nav" class="nav-toggle nav-toggle-menu icon-menu"><span class="is-vishidden">Menu</span></a>
-	{% include "molecules-primary-nav" %}
-	{% include "molecules-search" %}
+	{% include "@molecules/05-navigation/00-primary-nav.twig" %}
+	{% include "@molecules/04-forms/00-search.twig" %}
 </header>
-<!-- End .header -->
+<!-- End .header -->
diff --git a/dist/_patterns/02-organisms/01-article/00-article-body.twig b/dist/_patterns/02-organisms/01-article/00-article-body.twig
@@ -2,21 +2,21 @@
 
 <p><a href="#">Aliquam erat volutpat.</a> Mauris vulputate scelerisque feugiat. Cras a erat a diam venenatis aliquam. Sed tempus, purus ac pretium varius, risus orci sagittis purus, quis auctor libero magna nec magna. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Maecenas eros dolor, rutrum eu sollicitudin eu, commodo at leo. Suspendisse potenti. Sed eu nibh sit amet quam auctor feugiat vel et risus. Maecenas eu urna adipiscing neque dictum mollis suscipit in augue. Praesent pulvinar condimentum sagittis. Maecenas laoreet neque non eros consectetur fringilla. Donec vitae risus leo, vitae pharetra ipsum. Sed placerat eros eget elit iaculis semper. Aliquam congue blandit orci ac pretium.</p>
 
-{% include "atoms-landscape-16x9" %} 
+{% include "@atoms/04-images/02-landscape-16x9.twig" %}
 
 <p>Aliquam ultrices cursus mauris, eget volutpat justo mattis nec. Sed a orci turpis. Aliquam aliquet placerat dui, consectetur tincidunt leo tristique et. Vivamus enim nisi, blandit a venenatis quis, convallis et arcu. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Mauris libero sapien, placerat in sodales eu, tempor quis dui. Vivamus egestas faucibus pulvinar. Maecenas eget diam nunc. Phasellus at sem eros, ac suscipit neque. Phasellus sollicitudin libero a odio dignissim scelerisque. Aliquam purus nulla, tempor eget ullamcorper quis, rhoncus non dui.
 </p>
 
-{% include "atoms-blockquote" %} 
+{% include "@atoms/02-text/02-blockquote.twig" %}
 
 <p>Cras at fringilla ipsum. Donec nec libero eget est blandit dignissim a eu ante. Morbi augue nulla, luctus eu sagittis vel, malesuada ut felis. Aliquam erat volutpat. Morbi malesuada augue ac massa hendrerit fermentum. Integer scelerisque lacus a dolor convallis lobortis. Curabitur mollis ante in massa ultricies dignissim.
 </p>
 
-{% include "atoms-unordered" %} 
+{% include "@atoms/03-lists/00-unordered.twig" %}
 
-{% include "atoms-ordered" %}
+{% include "@atoms/03-lists/01-ordered.twig" %}
 
 <p>Donec posuere fringilla nunc, vitae venenatis diam scelerisque vel. Nullam vitae mauris magna. Mauris et diam quis justo volutpat tincidunt congue nec magna. Curabitur vitae orci elit. Ut mollis massa id magna vestibulum consequat. Proin rutrum lectus justo, sit amet tincidunt est. Vivamus vitae lacinia risus.
 </p>
 
-<p>Lorem ipsum dolor sit amet, consectetur adipisicing elit. Reiciendis, suscipit repellendus nulla accusantium deserunt sed explicabo voluptate sapiente ratione inventore molestiae nihil earum repellat quia odit vitae perspiciatis aliquam amet?</p>
+<p>Lorem ipsum dolor sit amet, consectetur adipisicing elit. Reiciendis, suscipit repellendus nulla accusantium deserunt sed explicabo voluptate sapiente ratione inventore molestiae nihil earum repellat quia odit vitae perspiciatis aliquam amet?</p>
diff --git a/dist/_patterns/02-organisms/02-comments/00-comment-thread.twig b/dist/_patterns/02-organisms/02-comments/00-comment-thread.twig
@@ -1,12 +1,12 @@
 <section class="comments section">
 	<div class="comments-container" id="comments-container">
 		<h2 class="section-title">59 Comments</h2>
-		{% include "molecules-comment-form" %} 
+		{% include "@molecules/04-forms/01-comment-form.twig" %}
 		<ul class="comment-list">
 			{% for item in 1..5 %}
-				{% include "molecules-single-comment" %} 
+				{% include "@molecules/06-components/02-single-comment.twig" %}
 			{% endfor %}
 		</ul>
 	</div>
-	{% include "molecules-pagination" %} 
-</section>
+	{% include "@molecules/05-navigation/03-pagination.twig" %}
+</section>
diff --git a/dist/_patterns/02-organisms/03-sections/00-latest-posts.twig b/dist/_patterns/02-organisms/03-sections/00-latest-posts.twig
@@ -2,8 +2,8 @@
     <h2 class="section-title">Latest Posts</h2>
     <ul class="post-list">
     {% for post in latest_posts %}
-      <li>{% include "molecules-media-block" %}</li>
+      <li>{% include "@molecules/02-blocks/00-media-block.twig" %}</li>
     {% endfor %}
   </ul>
     <a href="#" class="text-btn">View more posts</a>
-</section>
+</section>
diff --git a/dist/_patterns/03-templates/00-layouts/00-site.twig b/dist/_patterns/03-templates/00-layouts/00-site.twig
@@ -1,9 +1,9 @@
 <div class="page" id="page">
-    {% include "organisms-header" %}
+    {% include "@organisms/00-global/00-header.twig" %}
     <div role="main">
         {% block hero %}{% endblock %}
         {% block title %}{% endblock %}
         {% block content %}{% endblock %}
     </div><!--End role=main-->
-    {% include "organisms-footer" %}
-</div>
+    {% include "@organisms/00-global/01-footer.twig" %}
+</div>
diff --git a/dist/_patterns/03-templates/00-layouts/01-page-1col.twig b/dist/_patterns/03-templates/00-layouts/01-page-1col.twig
@@ -1,4 +1,4 @@
-{% extends "templates-site" %}
+{% extends "@templates/00-layouts/00-site.twig" %}
 {% block content %}
 <div class="l-one-col">
     <div class="l-main">
@@ -7,4 +7,4 @@
         {% endblock %}
     </div>
 </div>
-{% endblock %}
+{% endblock %}
diff --git a/dist/_patterns/03-templates/00-layouts/01-page-2col.twig b/dist/_patterns/03-templates/00-layouts/01-page-2col.twig
@@ -1,4 +1,4 @@
-{% extends "templates-site" %}
+{% extends "@templates/00-layouts/00-site.twig" %}
 {% block content %}
 <div class="l-two-col">
     <div class="l-main">
@@ -12,4 +12,4 @@
         {% endblock %}
     </div>
 </div>
-{% endblock %}
+{% endblock %}
diff --git a/dist/_patterns/03-templates/01-homepage.twig b/dist/_patterns/03-templates/01-homepage.twig
@@ -1,16 +1,16 @@
-{% extends "templates-page-2col" %}
+{% extends "@templates/00-layouts/01-page-2col.twig" %}
 {% block hero %}
     {% if emergency %}
-        {% include "molecules-alert" with emergency %}
+        {% include "@molecules/07-messaging/00-alert.twig" with emergency %}
     {% endif %}
     {% if hero %}
-        {% include "molecules-block-hero" %}
+        {% include "@molecules/02-blocks/02-block-hero.twig" %}
     {% endif %}
 
     <div class="g g-3up">
         {% for tout in touts %}
             <div class="gi">
-                {% include "molecules-block-inset" %}
+                {% include "@molecules/02-blocks/05-block-inset.twig" %}
             </div>
         {% endfor %}
     </div><!--end 3up-->
@@ -23,13 +23,13 @@
         <h2 class="section-title">Latest Posts</h2>
         <ul class="post-list">
             {% for post in latest_posts %}
-                <li>{% include "molecules-media-block" %}</li>
+                <li>{% include "@molecules/02-blocks/00-media-block.twig" %}</li>
             {% endfor %}
         </ul>
         <a href="#" class="text-btn">View more posts</a>
     </section>
 {% endblock %}
 
 {% block sidebar %}
-    {% include "organisms-recent-tweets" %}
+    {% include "@organisms/03-sections/01-recent-tweets.twig" %}
 {% endblock %}
diff --git a/dist/_patterns/03-templates/02-blog.twig b/dist/_patterns/03-templates/02-blog.twig
@@ -1,11 +1,11 @@
-{% extends "templates-site" %}
+{% extends "@templates/00-layouts/00-site.twig" %}
 {% block title %}<h1 class="section-title">Our Outdoor Blog</h1>{% endblock %}
 
 {% block main %}
-    {% include "organisms-latest-posts" %}
-    {% include "molecules-pagination" %}
+    {% include "@organisms/03-sections/00-latest-posts.twig" %}
+    {% include "@molecules/05-navigation/03-pagination.twig" %}
 {% endblock %}
 
 {% block sidebar %}
-    {% include "organisms-recent-tweets" %}
-{% endblock %}
+    {% include "@organisms/03-sections/01-recent-tweets.twig" %}
+{% endblock %}
diff --git a/dist/_patterns/03-templates/03-article-2col.twig b/dist/_patterns/03-templates/03-article-2col.twig
@@ -1,17 +1,17 @@
-{% extends "templates-page-2col" %}
+{% extends "@templates/page-2col.twig" %}
 {% block main %}
     <article class="article">
         <header class="article-header">
             <h1>Article Headline Lorem ipsum dolor sit aweofij</h1>
-            {% include "molecules-byline" %}
+            {% include "@molecules/00-text/00-byline.twig" %}
         </header>
-        {% include "organisms-article-body" %}
+        {% include "@organisms/article-body.twig" %}
     </article><!--end .article-->
-    {% include "molecules-social-share" %}
-    {% include "organisms-comment-thread" %}
+    {% include "@molecules/social-share.twig" %}
+    {% include "@organisms/comment-thread.twig" %}
 {% endblock %}
 
 {% block sidebar %}
-    {% include "organisms-related-posts" %}
-    {% include "organisms-recent-tweets" %}
+    {% include "@organisms/related-posts.twig" %}
+    {% include "@organisms/recent-tweets.twig" %}
 {% endblock %}
diff --git a/dist/_patterns/03-templates/03-article.twig b/dist/_patterns/03-templates/03-article.twig
@@ -1,12 +1,12 @@
-{% extends "templates-page-1col" %}
+{% extends "@templates/00-layouts/01-page-1col.twig" %}
 {% block main %}
     <article class="article">
         <header class="article-header">
             <h1>Article Headline Lorem ipsum dolor sit aweofij</h1>
-            {% include "molecules-byline" %}
+            {% include "@molecules/00-text/00-byline.twig" %}
         </header>
-        {% include "organisms-article-body" %}
+        {% include "@organisms/01-article/00-article-body.twig" %}
     </article><!--end .article-->
-    {% include "molecules-social-share" %}
-    {% include "organisms-comment-thread" %}
+    {% include "@molecules/06-components/00-social-share.twig" %}
+    {% include "@organisms/02-comments/00-comment-thread.twig" %}
 {% endblock %}
diff --git a/dist/_patterns/04-pages/00-homepage.twig b/dist/_patterns/04-pages/00-homepage.twig
@@ -1 +1 @@
-{% include "templates-homepage" %}
+{% include "@templates/01-homepage.twig" %}
diff --git a/dist/_patterns/04-pages/01-blog.twig b/dist/_patterns/04-pages/01-blog.twig
@@ -1 +1 @@
-{% include "templates-blog" %}
+{% include "@templates/02-blog.twig" %}
diff --git a/dist/_patterns/04-pages/02-article.twig b/dist/_patterns/04-pages/02-article.twig
@@ -1 +1 @@
-{% include "templates-article-2col" %}
+{% include "@templates/03-article-2col.twig" %}
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
-  "name": "starterkit-twig-demo",
-  "version": "3.0.1",
+  "name": "@pattern-lab/starterkit-twig-demo",
+  "version": "4.0.0",
   "description": "Pattern Lab's Demo StarterKit for Twig.",
   "main": "README.md",
   "repository": {
@@ -18,5 +18,8 @@
   "bugs": {
     "url": "https://github.com/pattern-lab/starterkit-twig-demo/issues"
   },
-  "homepage": "https://github.com/pattern-lab/starterkit-twig-demo#readme"
+  "homepage": "https://github.com/pattern-lab/starterkit-twig-demo#readme",
+  "publishConfig": {
+    "access": "public"
+  }
 }

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-{% import "forms.twig" as forms %}`
	`1`	`+{% import "@macros/forms.twig" as forms %}`
`2`	`2`	`<fieldset>`
`3`	`3`	`{{ forms.input('Text Input') }}`
`4`	`4`	`{{ forms.input('Password', 'password') }}`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-<div class="byline">by {{ author.first_name }} {{ author.last_name }}</div>`
	`1`	`+<div class="byline">by {{ author.first_name }} {{ author.last_name }}</div>`