From 9fa0eab47fbd616308a7618beac7602bec1caf6a Mon Sep 17 00:00:00 2001
From: Ben Leggiero <BenLeggiero@Gmail.com>
Date: Tue, 26 Nov 2019 21:26:31 -0700
Subject: [PATCH 1/4] Ignore .DS_Store

---
 .gitignore | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.gitignore b/.gitignore
index 2ca8682..9a71a3d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,5 @@ _site/
 .sass-cache/
 .jekyll-cache/
 .jekyll-metadata
+
+.DS_Store

From 5a32c02949903e4006e1cc8ce3589c3a60181d17 Mon Sep 17 00:00:00 2001
From: Ben Leggiero <BenLeggiero@Gmail.com>
Date: Tue, 26 Nov 2019 21:45:03 -0700
Subject: [PATCH 2/4] #1: Trying to use the sidebar from my blog

With some changes to make it a more generic import
---
 Sidebar/sidebar.html | 41 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 41 insertions(+)
 create mode 100644 Sidebar/sidebar.html

diff --git a/Sidebar/sidebar.html b/Sidebar/sidebar.html
new file mode 100644
index 0000000..e0d19ea
--- /dev/null
+++ b/Sidebar/sidebar.html
@@ -0,0 +1,41 @@
+
+<nav class="sidebar   flex-column flex-vert-space-between">
+    <section>
+        {%- unless include.emptyHeader -%}
+        <header>
+            <figure>
+                {%- if include.headerImage -%}
+                <img src="{{ include.headerImage.url }}" class="{{ include.headerImage.htmlClassNames }}"/>
+                {%- else -%}
+                No header image supplied; <code>emptyHeader</code> was not <code>true</code>
+                {%- endif -%}
+            </figure>
+        </header>
+        {%- endunless -%}
+        <ul>
+            {% for link in include.links %}
+            <li><a href="{{ link.url }}" class="button">{{ link.text }}</a></li>
+            {% endfor %}
+        </ul>
+    </section>
+
+    {%- for sectionInclude in include.additionalSectionIncludes -%}
+    <section>
+        {% include {{ sectionInclude }} %}
+    </section>
+    {%- endfor -%}
+
+    <section>
+        <ul class="theme-color-selection-list">
+            <li><a href="#Brightness-Dark"  onclick="return false" title="Dark"  class="color-swatch" theme-swatch-type="brightness" theme-swatch-value="dark" >Dark</a></li>
+            <li><a href="#Brightness-Light" onclick="return false" title="Light" class="color-swatch" theme-swatch-type="brightness" theme-swatch-value="light">Light</a></li>
+        </ul>
+        <ul class="theme-color-selection-list">
+            <li><a href="#Theme-Water" onclick="return false" title="Water" class="color-swatch" theme-swatch-type="color" theme-swatch-value="water">Water</a></li>
+            <li><a href="#Theme-Earth" onclick="return false" title="Earth" class="color-swatch" theme-swatch-type="color" theme-swatch-value="earth">Earth</a></li>
+            <li><a href="#Theme-Fire"  onclick="return false" title="Fire"  class="color-swatch" theme-swatch-type="color" theme-swatch-value="fire" >Fire</a></li>
+            <li><a href="#Theme-Air"   onclick="return false" title="Air"   class="color-swatch" theme-swatch-type="color" theme-swatch-value="air"  >Air</a></li>
+       <!-- <li><a href="#Theme-Magic" onclick="return false" title="Magic" class="color-swatch" theme-swatch-type="color" theme-swatch-value="magic">Magic</a></li> -->
+        </ul>
+    </section>
+</nav>

From 45e9a675b0881d50d4cac025edb93b6413887178 Mon Sep 17 00:00:00 2001
From: Ben Leggiero <BenLeggiero@Gmail.com>
Date: Tue, 3 Dec 2019 23:17:33 -0700
Subject: [PATCH 3/4] #1: Added options to sidefar

---
 Sidebar/sidebar.html | 28 +++++++++++++++++++++-------
 1 file changed, 21 insertions(+), 7 deletions(-)

diff --git a/Sidebar/sidebar.html b/Sidebar/sidebar.html
index e0d19ea..ea2e7e5 100644
--- a/Sidebar/sidebar.html
+++ b/Sidebar/sidebar.html
@@ -1,7 +1,7 @@
 
 <nav class="sidebar   flex-column flex-vert-space-between">
     <section>
-        {%- unless include.emptyHeader -%}
+        {%- unless include.emptyHeader %}
         <header>
             <figure>
                 {%- if include.headerImage -%}
@@ -11,19 +11,33 @@
                 {%- endif -%}
             </figure>
         </header>
-        {%- endunless -%}
+        {%- endunless %}
+        {%- if site.sidebar.defaultLinks %}
+        {%- assign links=include.links | concat: site.sidebar.defaultLinks %}
+        {%- else %}
+        {%- assign links=include.links %}
+        {%- endif %}
+        {%- assign linksCount=links | size %}
+        {%- unless linksCount == 0 %}
         <ul>
-            {% for link in include.links %}
-            <li><a href="{{ link.url }}" class="button">{{ link.text }}</a></li>
-            {% endfor %}
+            {%- for link in links %}
+            <li><a href="{{ link.url }}" class="button">
+                {%- if link.materialIcon -%}
+                <i class="material-icons">{{ link.materialIcon }}</i>
+                {%- elsif link.fontAwesomeIcon -%}
+                <i class="{{ link.fontAwesomeIcon }}"></i>
+                {%- endif -%}
+                {{ link.text }}</a></li>
+            {%- endfor %}
         </ul>
+        {%- endunless %}
     </section>
 
-    {%- for sectionInclude in include.additionalSectionIncludes -%}
+    {%- for sectionInclude in include.additionalSectionIncludes %}
     <section>
         {% include {{ sectionInclude }} %}
     </section>
-    {%- endfor -%}
+    {%- endfor %}
 
     <section>
         <ul class="theme-color-selection-list">

From 7e3119ae1342b2bd57abea1170d566eda435aafb Mon Sep 17 00:00:00 2001
From: Ben Leggiero <BenLeggiero@Gmail.com>
Date: Sun, 2 Feb 2020 22:08:37 -0700
Subject: [PATCH 4/4] Updated sidebar to be more ergonomic when accepting
 header image

---
 Sidebar/sidebar.html | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Sidebar/sidebar.html b/Sidebar/sidebar.html
index ea2e7e5..fae1889 100644
--- a/Sidebar/sidebar.html
+++ b/Sidebar/sidebar.html
@@ -4,10 +4,10 @@
         {%- unless include.emptyHeader %}
         <header>
             <figure>
-                {%- if include.headerImage -%}
-                <img src="{{ include.headerImage.url }}" class="{{ include.headerImage.htmlClassNames }}"/>
+                {%- if include.headerImage_url -%}
+                <img src="{{ include.headerImage_url }}" class="{{ include.headerImage_htmlClassNames }}"/>
                 {%- else -%}
-                No header image supplied; <code>emptyHeader</code> was not <code>true</code>
+                No header image supplied; <code>headerImage_url</code> was missing and <code>emptyHeader</code> was not <code>true</code>
                 {%- endif -%}
             </figure>
         </header>