From 4d1378b4b3c823d4a1315cbd02fa4fefbbf30bac Mon Sep 17 00:00:00 2001
From: Adam Hollett <adammhollett@gmail.com>
Date: Mon, 14 Dec 2015 21:10:10 -0500
Subject: [PATCH] Uncomplicate the sidebar

---
 _includes/home-banner.html |  2 +-
 _includes/sidebar.html     | 24 +++++++-----------------
 _layouts/default.html      |  3 +++
 _sass/modules/_layout.scss |  1 +
 filters/append.md          |  2 +-
 filters/capitalize.md      |  2 +-
 filters/date.md            |  2 +-
 filters/default.md         |  2 +-
 filters/divided_by.md      |  2 +-
 filters/downcase.md        |  2 +-
 filters/escape.md          |  2 +-
 filters/escape_once.md     |  2 +-
 filters/first.md           |  2 +-
 filters/floor.md           |  2 +-
 filters/join.md            |  2 +-
 filters/last.md            |  2 +-
 filters/lstrip.md          |  2 +-
 filters/minus.md           |  2 +-
 filters/modulo.md          |  2 +-
 filters/newline_to_br.md   |  2 +-
 filters/plus.md            |  2 +-
 filters/prepend.md         |  2 +-
 filters/remove.md          |  2 +-
 filters/remove_first.md    |  2 +-
 filters/replace.md         |  2 +-
 filters/replace_first.md   |  2 +-
 filters/reverse.md         |  2 +-
 filters/round.md           |  2 +-
 filters/rstrip.md          |  2 +-
 filters/size.md            |  2 +-
 filters/slice.md           |  2 +-
 filters/split.md           |  2 +-
 filters/strip.md           |  2 +-
 filters/strip_html.md      |  2 +-
 filters/strip_newlines.md  |  2 +-
 filters/times.md           |  2 +-
 filters/truncatewords.md   |  2 +-
 filters/uniq.md            |  2 +-
 filters/upcase.md          |  2 +-
 filters/url_encode.md      |  2 +-
 index.md                   |  2 +-
 41 files changed, 49 insertions(+), 55 deletions(-)

diff --git a/_includes/home-banner.html b/_includes/home-banner.html
index 06a5c5b..da17c86 100644
--- a/_includes/home-banner.html
+++ b/_includes/home-banner.html
@@ -1,6 +1,6 @@
 <header class="home--banner">
   <h1>Liquid</h1>
-  <p>Ruby library for rendering safe templates which cannot affect the security of the server they are rendered on.</p>
+  <p>Safe, customer facing template language for flexible web apps.</p>
   <p class="btn-row">
     <a href="https://github.com/Shopify/liquid/archive/master.zip" target="_blank" class="btn"><i class="icon fa fa-2x fa-arrow-circle-down"></i>Download</a>
     <a href="https://github.com/Shopify/liquid" target="_blank" class="btn"><i class="icon fa fa-2x fa-github"></i>View on Github</a>
diff --git a/_includes/sidebar.html b/_includes/sidebar.html
index bd262e1..089ab92 100644
--- a/_includes/sidebar.html
+++ b/_includes/sidebar.html
@@ -2,25 +2,15 @@
   <div class="sidebar--logo">
     <a href="/">Liquid</a>
   </div>
-  <nav class="sidebar--nav">
-
-    {% capture folders %}basics,tags,filters{% endcapture %}
-    {% assign sections = folders | split: "," %}
+  <nav class="sidebar--nav"> {% assign sections = "basics, tags, filters" | split: ", " %}
 
     {% for section in sections %}
-    <ul class="section">
-      <li>
-        <h3 class="section__header">{{ section | capitalize }}</h3>
-        <ul class="section__links">
-          {% for page in site.pages %}
-            {% if page.path contains section/ %}
-              {% unless page.path contains "index.html" %}
-              <li><a href="{{ page.url | prepend: site.baseurl }}" class="section__link">{{ page.title }}</a></li>
-              {% endunless %}
-            {% endif %}
-          {% endfor %}
-        </ul>
-      </li>
+    <h3 class="section__header">{{ section | capitalize }}</h3>
+
+    <ul class="section__links">
+    {% for page in site.pages %}{% if page.url contains section/ %}{% unless page.path contains "index" %}
+      <li><a href="{{ page.url | prepend: site.baseurl }}" class="section__link">{{ page.title }}</a></li>
+    {% endunless %}{% endif %}{% endfor %}
     </ul>
     {% endfor %}
 
diff --git a/_layouts/default.html b/_layouts/default.html
index 41cf352..180172c 100644
--- a/_layouts/default.html
+++ b/_layouts/default.html
@@ -20,8 +20,11 @@
 
     <div class="content__area">
       <div class="content__list">
+
         <h1>{{ page.title }}</h1>
+
         {{ content }}
+
       </div>
     </div>
 
diff --git a/_sass/modules/_layout.scss b/_sass/modules/_layout.scss
index 2107b75..1dc701e 100644
--- a/_sass/modules/_layout.scss
+++ b/_sass/modules/_layout.scss
@@ -84,6 +84,7 @@ $wrapper-width: 800px;
 
 .section__links {
   margin-left: $spacing-unit / 2;
+  margin-bottom: $spacing-unit;
   font-weight: normal;
   font-size: 0.9em;
 }
diff --git a/filters/append.md b/filters/append.md
index 80e438b..1b6202f 100644
--- a/filters/append.md
+++ b/filters/append.md
@@ -2,7 +2,7 @@
 title: append
 ---
 
-`append` concatenates two strings and returns the concatenated value.
+Concatenates two strings and returns the concatenated value.
 
 ```liquid
 {% raw %}
diff --git a/filters/capitalize.md b/filters/capitalize.md
index f191328..1eaf8ec 100644
--- a/filters/capitalize.md
+++ b/filters/capitalize.md
@@ -2,7 +2,7 @@
 title: capitalize
 ---
 
-`capitalize` makes the first character of your string capitalized.
+Makes the first character of a string capitalized.
 
 ```liquid
 {% raw %}
diff --git a/filters/date.md b/filters/date.md
index cf64fcf..1d4274c 100644
--- a/filters/date.md
+++ b/filters/date.md
@@ -2,7 +2,7 @@
 title: date
 ---
 
-`date` converts a timestamp into another date format. The format for this syntax is the same as [`strftime`](//strftime.net).
+Converts a timestamp into another date format. The format for this syntax is the same as [`strftime`](//strftime.net).
 
 ```liquid
 {% raw %}
diff --git a/filters/default.md b/filters/default.md
index d948bea..28020e9 100644
--- a/filters/default.md
+++ b/filters/default.md
@@ -2,7 +2,7 @@
 title: default
 ---
 
-`default` lets you specify a fallback in case a value doesn't exist. `default` will show its value if the left side is `nil`, `false`, or empty.
+Allows you to specify a fallback in case a value doesn't exist. `default` will show its value if the left side is `nil`, `false`, or empty.
 
 In this example, `product_price` is not defined, so the default value is used.
 
diff --git a/filters/divided_by.md b/filters/divided_by.md
index ac1fb2a..defffa8 100644
--- a/filters/divided_by.md
+++ b/filters/divided_by.md
@@ -2,7 +2,7 @@
 title: divided_by
 ---
 
-`divided_by` divides its input (left side) by its argument (right side). It uses `to_number`, which converts to a decimal value unless already a numeric.
+Divides a number by its argument.
 
 The result is rounded down to the nearest integer (that is, the [floor](/filters/floor)).
 
diff --git a/filters/downcase.md b/filters/downcase.md
index bbb96a0..f86c952 100644
--- a/filters/downcase.md
+++ b/filters/downcase.md
@@ -2,7 +2,7 @@
 title: downcase
 ---
 
-`downcase` makes each character in a string lowercase. It has no effect on strings which are already all lowercase.
+Makes each character in a string lowercase. It has no effect on strings which are already all lowercase.
 
 ```liquid
 {% raw %}
diff --git a/filters/escape.md b/filters/escape.md
index 3a1bd38..508f808 100644
--- a/filters/escape.md
+++ b/filters/escape.md
@@ -2,7 +2,7 @@
 title: escape
 ---
 
-Escapes a string by replacing some characters with escape sequences (so that the string can be used in a URL, for example). It doesn't change strings that have nothing to escape.
+Escapes a string by replacing characters with escape sequences (so that the string can be used in a URL, for example). It doesn't change strings that don't have anything to escape.
 
 ```liquid
 {% raw %}
diff --git a/filters/escape_once.md b/filters/escape_once.md
index 4d8e7c0..e8160a9 100644
--- a/filters/escape_once.md
+++ b/filters/escape_once.md
@@ -2,7 +2,7 @@
 title: escape_once
 ---
 
-Escapes a string without changing existing escaped entities. It doesn't change strings that have nothing to escape.
+Escapes a string without changing existing escaped entities. It doesn't change strings that don't have anything to escape.
 
 ```liquid
 {% raw %}
diff --git a/filters/first.md b/filters/first.md
index bc455d7..8513a60 100644
--- a/filters/first.md
+++ b/filters/first.md
@@ -2,7 +2,7 @@
 title: first
 ---
 
-`first` returns the first element of an array without sorting the array.
+Returns the first item of an array.
 
 ```liquid
 {% raw %}
diff --git a/filters/floor.md b/filters/floor.md
index 6ebb72f..7bf1724 100644
--- a/filters/floor.md
+++ b/filters/floor.md
@@ -2,7 +2,7 @@
 title: floor
 ---
 
-`floor` rounds the input down to the nearest whole number.
+Rounds a number down to the nearest whole number.
 
 ```liquid
 {% raw %}
diff --git a/filters/join.md b/filters/join.md
index 567e982..dfff763 100644
--- a/filters/join.md
+++ b/filters/join.md
@@ -2,7 +2,7 @@
 title: join
 ---
 
-`join` combines the elements of an array into a single string using the string you provide as a separator.
+Combines the items in an array into a single string using the argument as a separator.
 
 ```liquid
 {% raw %}
diff --git a/filters/last.md b/filters/last.md
index 1ed8008..5e4454e 100644
--- a/filters/last.md
+++ b/filters/last.md
@@ -2,7 +2,7 @@
 title: last
 ---
 
-`last` returns the last element of an array without sorting the array.
+Returns the last item of an array.
 
 ```liquid
 {% raw %}
diff --git a/filters/lstrip.md b/filters/lstrip.md
index 2ef7733..4693fc6 100644
--- a/filters/lstrip.md
+++ b/filters/lstrip.md
@@ -2,7 +2,7 @@
 title: lstrip
 ---
 
-`lstrip` removes all whitespace (tabs, spaces, and newlines) from the left side of a string.
+Removes all whitespaces (tabs, spaces, and newlines) from a string.
 
 ```liquid
 {% raw %}
diff --git a/filters/minus.md b/filters/minus.md
index 0084c97..0ccc036 100644
--- a/filters/minus.md
+++ b/filters/minus.md
@@ -2,7 +2,7 @@
 title: minus
 ---
 
-`minus` subtracts the number passed in from the input number.
+Subtracts a number from another number.
 
 ```liquid
 {% raw %}
diff --git a/filters/modulo.md b/filters/modulo.md
index ace654a..6a57cd3 100644
--- a/filters/modulo.md
+++ b/filters/modulo.md
@@ -2,7 +2,7 @@
 title: modulo
 ---
 
-`modulo` returns the remainder when the input is divided by the passed-in parameter.
+Returns the remainder of a division operation.
 
 ```liquid
 {% raw %}
diff --git a/filters/newline_to_br.md b/filters/newline_to_br.md
index 6bba682..c5aabbc 100644
--- a/filters/newline_to_br.md
+++ b/filters/newline_to_br.md
@@ -2,7 +2,7 @@
 title: newline_to_br
 ---
 
-Replace every newline (`\n`) with an HTML line break (`<br>`).
+Replaces every newline (`\n`) with an HTML line break (`<br>`).
 
 ```liquid
 {% raw %}
diff --git a/filters/plus.md b/filters/plus.md
index b2d121c..223a3cd 100644
--- a/filters/plus.md
+++ b/filters/plus.md
@@ -2,7 +2,7 @@
 title: plus
 ---
 
-`plus` adds the number passed in to the input number.
+Adds a number with another number.
 
 ```liquid
 {% raw %}
diff --git a/filters/prepend.md b/filters/prepend.md
index 19ed67d..efbd5a8 100644
--- a/filters/prepend.md
+++ b/filters/prepend.md
@@ -2,7 +2,7 @@
 title: prepend
 ---
 
-`prepend` adds a string to the beginning of the input string.
+Concatenates a string to the beginning of a string.
 
 ```liquid
 {% raw %}
diff --git a/filters/remove.md b/filters/remove.md
index 1bc5df7..948d0dc 100644
--- a/filters/remove.md
+++ b/filters/remove.md
@@ -2,7 +2,7 @@
 title: remove
 ---
 
-`remove` removes every occurrence of of the passed-in substring from the input string.
+Removes every occurrence of an argument from a string.
 
 ```liquid
 {% raw %}
diff --git a/filters/remove_first.md b/filters/remove_first.md
index 3e7c19d..59b1fe9 100644
--- a/filters/remove_first.md
+++ b/filters/remove_first.md
@@ -2,7 +2,7 @@
 title: remove_first
 ---
 
-`remove` removes the first occurrence of of the passed-in substring from the input string.
+Removes only the first occurrence of an argument from a string.
 
 ```liquid
 {% raw %}
diff --git a/filters/replace.md b/filters/replace.md
index d8faf5c..62a14f2 100644
--- a/filters/replace.md
+++ b/filters/replace.md
@@ -2,7 +2,7 @@
 title: replace
 ---
 
-`replace` replaces every occurrence of the first passed-in string in the input string with the second passed-in string.
+Replaces every occurrence of an argument in a string with the second argument.
 
 ```liquid
 {% raw %}
diff --git a/filters/replace_first.md b/filters/replace_first.md
index babc555..928c2bc 100644
--- a/filters/replace_first.md
+++ b/filters/replace_first.md
@@ -2,7 +2,7 @@
 title: replace_first
 ---
 
-`replace_first` replaces the first occurrence of the first passed-in string in the input string with the second passed-in string.
+Replaces only the first occurrence of an argument in a string with the second argument.
 
 ```liquid
 {% raw %}
diff --git a/filters/reverse.md b/filters/reverse.md
index 2fa939e..15432f9 100644
--- a/filters/reverse.md
+++ b/filters/reverse.md
@@ -2,7 +2,7 @@
 title: reverse
 ---
 
-`reverse` reverses the order of the items in an array. `reverse` cannot reverse a string.
+Reverses the order of the items in an array. `reverse` cannot reverse a string.
 
 ```liquid
 {% raw %}
diff --git a/filters/round.md b/filters/round.md
index 9b18b9c..548386f 100644
--- a/filters/round.md
+++ b/filters/round.md
@@ -2,7 +2,7 @@
 title: round
 ---
 
-`round` rounds an input number to the nearest integer or, if a number is specified as a parameter, to that number of decimal places.
+Rounds an input number to the nearest integer or, if a number is specified as an argument, to that number of decimal places.
 
 ```liquid
 {% raw %}
diff --git a/filters/rstrip.md b/filters/rstrip.md
index a0dd51c..3aee7da 100644
--- a/filters/rstrip.md
+++ b/filters/rstrip.md
@@ -2,7 +2,7 @@
 title: rstrip
 ---
 
-`rstrip` removes all whitespace (tabs, spaces, and newlines) from the right side of a string.
+Removes all whitespace (tabs, spaces, and newlines) from the right side of a string.
 
 ```liquid
 {% raw %}
diff --git a/filters/size.md b/filters/size.md
index 4efda90..0242459 100644
--- a/filters/size.md
+++ b/filters/size.md
@@ -2,7 +2,7 @@
 title: size
 ---
 
-`size` returns the number of characters in a string or the number of items in an array. `size` can also be used with dot notation (for example, `{% raw %}{{ my_string.size }}{% endraw %}`). This allows you to use `size` inside other tags like conditionals.
+Returns the number of characters in a string or the number of items in an array. `size` can also be used with dot notation (for example, `{% raw %}{{ my_string.size }}{% endraw %}`). This allows you to use `size` inside  tags such as conditionals.
 
 ```liquid
 {% raw %}
diff --git a/filters/slice.md b/filters/slice.md
index 0b1ea0c..79aedad 100644
--- a/filters/slice.md
+++ b/filters/slice.md
@@ -2,7 +2,7 @@
 title: slice
 ---
 
-`slice` returns a substring of 1 character beginning at the index specified by the parameter passed in. An optional second parameter specifies the length of the substring to be returned.
+Returns a substring of 1 character beginning at the index specified by the argument passed in. An optional second argument specifies the length of the substring to be returned.
 
 String indices are numbered starting from 0.
 
diff --git a/filters/split.md b/filters/split.md
index 5a2a05b..740b6b4 100644
--- a/filters/split.md
+++ b/filters/split.md
@@ -2,7 +2,7 @@
 title: split
 ---
 
-`split` divides an input string into an array using the passed-in substring as a separator. `split` is commonly used to convert comma-separated items from a string to an array.
+Divides an input string into an array using the argument as a separator. `split` is commonly used to convert comma-separated items from a string to an array.
 
 ```liquid
 {% raw %}
diff --git a/filters/strip.md b/filters/strip.md
index f580f4e..588bbdf 100644
--- a/filters/strip.md
+++ b/filters/strip.md
@@ -2,7 +2,7 @@
 title: strip
 ---
 
-`strip` removes all whitespace (tabs, spaces, and newlines) from both the left and right sides of a string. It does not affect spaces between words.
+Removes all whitespace (tabs, spaces, and newlines) from both the left and right side of a string. It does not affect spaces between words.
 
 ```liquid
 {% raw %}
diff --git a/filters/strip_html.md b/filters/strip_html.md
index 5d25703..e44feee 100644
--- a/filters/strip_html.md
+++ b/filters/strip_html.md
@@ -2,7 +2,7 @@
 title: strip_html
 ---
 
-`strip_html` removes any HTML tags from a string.
+Removes any HTML tags from a string.
 
 
 ```liquid
diff --git a/filters/strip_newlines.md b/filters/strip_newlines.md
index 88edabe..0a0d48d 100644
--- a/filters/strip_newlines.md
+++ b/filters/strip_newlines.md
@@ -2,7 +2,7 @@
 title: strip_newlines
 ---
 
-`strip_newlines` removes any newline characters (line breaks) from a string.
+Removes any newline characters (line breaks) from a string.
 
 ```liquid
 {% raw %}
diff --git a/filters/times.md b/filters/times.md
index f0065f6..694959f 100644
--- a/filters/times.md
+++ b/filters/times.md
@@ -2,7 +2,7 @@
 title: times
 ---
 
-`times` multiplies its input by its argument.
+Multiplies a number by another number.
 
 ```liquid
 {% raw %}
diff --git a/filters/truncatewords.md b/filters/truncatewords.md
index 34888ce..e232428 100644
--- a/filters/truncatewords.md
+++ b/filters/truncatewords.md
@@ -2,7 +2,7 @@
 title: truncatewords
 ---
 
-`truncate` shortens a string down to the number of words passed as a parameter. If the number of words specified is less than the number of words in the string, an ellipsis (...) is appended to the string.
+Shortens a string down to the number of words passed as the argument. If the number of words specified is less than the number of words in the string, an ellipsis (...) is appended to the string.
 
 ```liquid
 {% raw %}
diff --git a/filters/uniq.md b/filters/uniq.md
index 0e97274..751d88a 100644
--- a/filters/uniq.md
+++ b/filters/uniq.md
@@ -2,7 +2,7 @@
 title: uniq
 ---
 
-`uniq` removes any duplicate elements in an array.
+Removes any duplicate elements in an array.
 
 ```liquid
 {% raw %}
diff --git a/filters/upcase.md b/filters/upcase.md
index 5948ec6..2aa7f0d 100644
--- a/filters/upcase.md
+++ b/filters/upcase.md
@@ -2,7 +2,7 @@
 title: upcase
 ---
 
-`upcase` makes each character in a string uppercase. It has no effect on strings which are already all uppercase.
+Makes each character in a string uppercase. It has no effect on strings which are already all uppercase.
 
 ```liquid
 {% raw %}
diff --git a/filters/url_encode.md b/filters/url_encode.md
index d2bd93c..68b10d1 100644
--- a/filters/url_encode.md
+++ b/filters/url_encode.md
@@ -2,7 +2,7 @@
 title: url_encode
 ---
 
-`url_encode` converts any URL-unsafe characters in a string into percent-encoded characters.
+Converts any URL-unsafe characters in a string into percent-encoded characters.
 
 ```liquid
 {% raw %}
diff --git a/index.md b/index.md
index fc2bfc8..d60868a 100644
--- a/index.md
+++ b/index.md
@@ -8,7 +8,7 @@ Liquid is an open-source template language created by [Shopify](https://www.shop
 
 Liquid has been in production use since June 2006 and is now used by many other hosted web applications.
 
-It was developed for usage in Ruby on Rails web applications and integrates seamlessly as a plugin but it also works well as a stand alone library.
+It was developed for usage in Ruby on Rails web applications and integrates seamlessly as a plugin but it also works well as a stand-alone library.
 
 ## Introduction