Fix conflicts

_config.yml

@@ -4,10 +4,6 @@ url: "http://liquidmarkup.org" # the base hostname & protocol for your site
 markdown: kramdown
 highlighter: pygments
 permalink: /:year/:month/:day/:basename:output_ext
-collections:
-  docs:
-    output: true
-    permalink: /docs/:path/
 exclude:
   - README.md
   - CNAME
@@ -19,14 +15,14 @@ defaults:
     values:
       layout: "default"
   - scope:
-      path: "docs/basics"
+      path: "basics"
     values:
       type: "basics"
   - scope:
-      path: "docs/filters"
+      path: "filters"
     values:
       type: "filters"
   - scope:
-      path: "docs/tags"
+      path: "tags"
     values:
       type: "tags"

_docs/tags/control-flow/case-when

@@ -1,27 +0,0 @@
-## case/when
-
-<p>Creates a switch statement to compare a variable with different values. <code>case</code> initializes the switch statement, and <code>when</code> compares its values.</p>
-
-<p class="input">Input</p>
-
-<div>
-{% highlight html %}{% raw %}
-{% assign handle = 'cake' %}
-{% case handle %}
-  {% when 'cake' %}
-     This is a cake
-  {% when 'cookie' %}
-     This is a cookie
-  {% else %}
-     This is not a cake nor a cookie
-{% endcase %}
-{% endraw %}{% endhighlight %}
-</div>
-
-<p class="output">Output</p>
-
-<div>
-{% highlight html %}{% raw %}
-This is a cake
-{% endraw %}{% endhighlight %}
-</div>

_docs/tags/control-flow/elsif-else.md

@@ -1,26 +0,0 @@
-## elsif / else
-
-<p>Adds more conditions within an <code>if</code> or <code>unless</code> block.</p>
-
-<p class="input">Input</p>
-
-<div>
-{% highlight html %}{% raw %}
-  <!-- If customer.name = 'anonymous' -->
-  {% if customer.name == 'kevin' %}
-    Hey Kevin!
-  {% elsif customer.name == 'anonymous' %}
-    Hey Anonymous!
-  {% else %}
-    Hi Stranger!
-  {% endif %}
-{% endraw %}{% endhighlight %}
-</div>
-
-<p class="output">Output</p>
-
-<div>
-{% highlight html %}{% raw %}
-Hey Anonymous!
-{% endraw %}{% endhighlight %}
-</div>

_docs/tags/control-flow/if.md

@@ -1,21 +0,0 @@
-## if
-
-<p>Executes a block of code only if a certain condition is met.</p>
-
-<p class="input">Input</p>
-
-<div>
-{% highlight html %}{% raw %}
-{% if product.title == 'Awesome Shoes' %}
-  These shoes are awesome!
-{% endif %}
-{% endraw %}{% endhighlight %}
-</div>
-
-<p class="output">Output</p>
-
-<div>
-{% highlight html %}{% raw %}
-These shoes are awesome!
-{% endraw %}{% endhighlight %}
-</div>

_docs/tags/control-flow/unless.md

@@ -1,31 +0,0 @@
-## unless
-
-<p>Similar to <code>if</code>, but executes a block of code only if a certain condition is <strong>not</strong> met.</p>
-
-<p class="input">Input</p>
-
-<div>
-{% highlight html %}{% raw %}
-  {% unless product.title == 'Awesome Shoes' %}
-    These shoes are not awesome.
-  {% endunless %}
-{% endraw %}{% endhighlight %}
-</div>
-
-<p class="output">Output</p>
-
-<div>
-{% highlight html %}{% raw %}
-These shoes are not awesome.
-{% endraw %}{% endhighlight %}
-</div>
-
-This would be the equivalent of doing the following:
-
-<div>
-{% highlight html %}{% raw %}
-  {% if product.title != 'Awesome Shoes' %}
-    These shoes are not awesome.
-  {% endif %}
-{% endraw %}{% endhighlight %}
-</div>

_layouts/default.html

@@ -27,11 +27,13 @@
           <li>
             <h3 class="section__header">Basics</h3>
             <ul class="section__links">
-              {% for doc in site.docs %}
+              {% for doc in site.pages %}
                 {% if doc.type == "basics" %}
+                  {% unless doc.path contains "index.html" %}
                   <li>
-                    <a href="/docs/{{ doc.type }}/{{ doc.title | slugify }}" class="section__link">{{ doc.title }}</a>
+                    <a href="/{{ doc.type }}/{{ doc.title | slugify }}" class="section__link">{{ doc.title }}</a>
                   </li>
+                  {% endunless %}
                 {% endif %}
               {% endfor %}
             </ul>
@@ -43,11 +45,13 @@
           <li>
             <h3 class="section__header">Tags</h3>
             <ul class="section__links">
-              {% for doc in site.docs %}
+              {% for doc in site.pages %}
                 {% if doc.type == "tags" %}
+                  {% unless doc.path contains "index.html" %}
                   <li>
-                    <a href="/docs/{{ doc.type }}/{{ doc.title | slugify }}" class="section__link">{{ doc.title }}</a>
+                    <a href="/{{ doc.type }}/{{ doc.title | slugify }}" class="section__link">{{ doc.title }}</a>
                   </li>
+                  {% endunless %}
                 {% endif %}
               {% endfor %}
             </ul>
@@ -59,12 +63,13 @@
           <li>
             <h3 class="section__header">Filters</h3>
             <ul class="section__links">
-              {% for doc in site.docs %}
+              {% for doc in site.pages %}
                 {% if doc.type == "filters" %}
-                  {% capture doc_url %}/docs/{{ doc.type }}/{{ doc.title | slugify }}/{% endcapture %}
+                  {% unless doc.path contains "index.html" %}
                   <li>
-                    <a href="{{ doc_url }}" class="section__link {% if doc_url == page.url %}section__link--is-active{% endif %}">{{ doc.title }}</a>
+                    <a href="/{{ doc.type }}/{{ doc.title | slugify }}" class="section__link">{{ doc.title }}</a>
                   </li>
+                  {% endunless %}
                 {% endif %}
               {% endfor %}
             </ul>

tags/control-flow/case-when.md

@@ -1,32 +0,0 @@
----
-category: control-flow
----
-
-
-## case/when
-
-<p>Creates a switch statement to compare a variable with different values. <code>case</code> initializes the switch statement, and <code>when</code> compares its values.</p>
-
-<p class="input">Input</p>
-
-<div>
-{% highlight html %}{% raw %}
-{% assign handle = 'cake' %}
-{% case handle %}
-  {% when 'cake' %}
-     This is a cake
-  {% when 'cookie' %}
-     This is a cookie
-  {% else %}
-     This is not a cake nor a cookie
-{% endcase %}
-{% endraw %}{% endhighlight %}
-</div>
-
-<p class="output">Output</p>
-
-<div>
-{% highlight html %}{% raw %}
-This is a cake
-{% endraw %}{% endhighlight %}
-</div>

tags/control-flow/elsif-else.md

@@ -1,26 +0,0 @@
-## elsif / else
-
-<p>Adds more conditions within an <code>if</code> or <code>unless</code> block.</p>
-
-<p class="input">Input</p>
-
-<div>
-{% highlight html %}{% raw %}
-  <!-- If customer.name = 'anonymous' -->
-  {% if customer.name == 'kevin' %}
-    Hey Kevin!
-  {% elsif customer.name == 'anonymous' %}
-    Hey Anonymous!
-  {% else %}
-    Hi Stranger!
-  {% endif %}
-{% endraw %}{% endhighlight %}
-</div>
-
-<p class="output">Output</p>
-
-<div>
-{% highlight html %}{% raw %}
-Hey Anonymous!
-{% endraw %}{% endhighlight %}
-</div>

tags/control-flow/if.md

@@ -1,21 +0,0 @@
-## if
-
-<p>Executes a block of code only if a certain condition is met.</p>
-
-<p class="input">Input</p>
-
-<div>
-{% highlight html %}{% raw %}
-{% if product.title == 'Awesome Shoes' %}
-  These shoes are awesome!
-{% endif %}
-{% endraw %}{% endhighlight %}
-</div>
-
-<p class="output">Output</p>
-
-<div>
-{% highlight html %}{% raw %}
-These shoes are awesome!
-{% endraw %}{% endhighlight %}
-</div>

tags/control-flow/index.html

@@ -1,14 +0,0 @@
----
-layout: default
----
-
-TAGS!
-
-{% for doc in site.collections["tags"].docs %}
-  <div id="{{ doc.title }}" class="content__item">
-    <h2 class="content__header">{{ doc.title }}</h2>
-    <div class="content">
-      {{ doc.content }}
-    </div>
-  </div>
-{% endfor %}

tags/control-flow/unless.md

@@ -1,31 +0,0 @@
-## unless
-
-<p>Similar to <code>if</code>, but executes a block of code only if a certain condition is <strong>not</strong> met.</p>
-
-<p class="input">Input</p>
-
-<div>
-{% highlight html %}{% raw %}
-  {% unless product.title == 'Awesome Shoes' %}
-    These shoes are not awesome.
-  {% endunless %}
-{% endraw %}{% endhighlight %}
-</div>
-
-<p class="output">Output</p>
-
-<div>
-{% highlight html %}{% raw %}
-These shoes are not awesome.
-{% endraw %}{% endhighlight %}
-</div>
-
-This would be the equivalent of doing the following:
-
-<div>
-{% highlight html %}{% raw %}
-  {% if product.title != 'Awesome Shoes' %}
-    These shoes are not awesome.
-  {% endif %}
-{% endraw %}{% endhighlight %}
-</div>

tags/control.flow.md

@@ -0,0 +1,113 @@
+---
+---
+
+TAGS!
+
+## case/when
+
+<p>Creates a switch statement to compare a variable with different values. <code>case</code> initializes the switch statement, and <code>when</code> compares its values.</p>
+
+<p class="input">Input</p>
+
+<div>
+{% highlight html %}{% raw %}
+{% assign handle = 'cake' %}
+{% case handle %}
+  {% when 'cake' %}
+     This is a cake
+  {% when 'cookie' %}
+     This is a cookie
+  {% else %}
+     This is not a cake nor a cookie
+{% endcase %}
+{% endraw %}{% endhighlight %}
+</div>
+
+<p class="output">Output</p>
+
+<div>
+{% highlight html %}{% raw %}
+This is a cake
+{% endraw %}{% endhighlight %}
+</div>
+
+## if
+
+<p>Executes a block of code only if a certain condition is met.</p>
+
+<p class="input">Input</p>
+
+<div>
+{% highlight html %}{% raw %}
+{% if product.title == 'Awesome Shoes' %}
+  These shoes are awesome!
+{% endif %}
+{% endraw %}{% endhighlight %}
+</div>
+
+<p class="output">Output</p>
+
+<div>
+{% highlight html %}{% raw %}
+These shoes are awesome!
+{% endraw %}{% endhighlight %}
+</div>
+
+## elsif / else
+
+<p>Adds more conditions within an <code>if</code> or <code>unless</code> block.</p>
+
+<p class="input">Input</p>
+
+<div>
+{% highlight html %}{% raw %}
+  <!-- If customer.name = 'anonymous' -->
+  {% if customer.name == 'kevin' %}
+    Hey Kevin!
+  {% elsif customer.name == 'anonymous' %}
+    Hey Anonymous!
+  {% else %}
+    Hi Stranger!
+  {% endif %}
+{% endraw %}{% endhighlight %}
+</div>
+
+<p class="output">Output</p>
+
+<div>
+{% highlight html %}{% raw %}
+Hey Anonymous!
+{% endraw %}{% endhighlight %}
+</div>
+
+## unless
+
+<p>Similar to <code>if</code>, but executes a block of code only if a certain condition is <strong>not</strong> met.</p>
+
+<p class="input">Input</p>
+
+<div>
+{% highlight html %}{% raw %}
+  {% unless product.title == 'Awesome Shoes' %}
+    These shoes are not awesome.
+  {% endunless %}
+{% endraw %}{% endhighlight %}
+</div>
+
+<p class="output">Output</p>
+
+<div>
+{% highlight html %}{% raw %}
+These shoes are not awesome.
+{% endraw %}{% endhighlight %}
+</div>
+
+This would be the equivalent of doing the following:
+
+<div>
+{% highlight html %}{% raw %}
+  {% if product.title != 'Awesome Shoes' %}
+    These shoes are not awesome.
+  {% endif %}
+{% endraw %}{% endhighlight %}
+</div>