fixed 2col article to be 2 columns, and standard article to be 1

anniegreens · anniegreens · commit 27cee4f8269d · 2016-04-25T14:54:08.000-07:00
diff --git 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-1col" %}
+{% extends "templates-page-2col" %}
 {% block main %}
     <article class="article">
         <header class="article-header">
@@ -10,3 +10,8 @@
     {% include "molecules-social-share" %}
     {% include "organisms-comment-thread" %}
 {% endblock %}
+
+{% block sidebar %}
+    {% include "organisms-related-posts" %}
+    {% include "organisms-recent-tweets" %}
+{% endblock %}
diff --git a/dist/_patterns/03-templates/03-article.twig b/dist/_patterns/03-templates/03-article.twig
@@ -1,4 +1,4 @@
-{% extends "templates-page-2col" %}
+{% extends "templates-page-1col" %}
 {% block main %}
     <article class="article">
         <header class="article-header">
@@ -10,8 +10,3 @@
     {% include "molecules-social-share" %}
     {% include "organisms-comment-thread" %}
 {% endblock %}
-	
-{% block sidebar %}
-    {% include "organisms-related-posts" %}
-    {% include "organisms-recent-tweets" %}
-{% endblock %}
diff --git a/dist/_patterns/04-pages/02-article.twig b/dist/_patterns/04-pages/02-article.twig
@@ -1 +1 @@
-{% include "templates-article" %}
+{% include "templates-article-2col" %}

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-{% include "templates-article" %}`
	`1`	`+{% include "templates-article-2col" %}`