From 05e02046ab43ccfbeb3c170763ae2e0226b82a6b Mon Sep 17 00:00:00 2001
From: drewcassidy <drewcassidy@me.com>
Date: Sun, 5 May 2019 19:07:16 -0700
Subject: [PATCH] Remove use of FontAwesome fonts and reference that in the
 license

---
 .gitmodules             |  3 ---
 License.md              |  7 +++++--
 _includes/head.html     |  4 ----
 _includes/sidebar.html  | 19 ++++++++++++++-----
 _layouts/post.html      |  2 +-
 css/sidebar.scss        | 20 +++++++++++++++++---
 css/site.scss           |  3 +++
 fa                      |  1 -
 svg/code-solid.svg      |  1 +
 svg/github-brands.svg   |  1 +
 svg/mastodon-brands.svg |  1 +
 svg/twitter-brands.svg  |  1 +
 12 files changed, 44 insertions(+), 19 deletions(-)
 delete mode 100644 .gitmodules
 delete mode 160000 fa
 create mode 100644 svg/code-solid.svg
 create mode 100644 svg/github-brands.svg
 create mode 100644 svg/mastodon-brands.svg
 create mode 100644 svg/twitter-brands.svg

diff --git a/.gitmodules b/.gitmodules
deleted file mode 100644
index b58b12c..0000000
--- a/.gitmodules
+++ /dev/null
@@ -1,3 +0,0 @@
-[submodule "fa"]
-	path = fa
-	url = https://github.com/FortAwesome/Font-Awesome.git
diff --git a/License.md b/License.md
index 663ba30..e9f2316 100644
--- a/License.md
+++ b/License.md
@@ -2,10 +2,13 @@
 layout: page
 title: License
 ---
+ Besides the following resources, all assets on this site are licensed under the Creative Commons Attribution-ShareAlike 4.0 International License below.
 
-## creative commons
+* Icons used are made by Font Awesome, and are under the [Font Awesome License](https://fontawesome.com/license). The only modifications made were to embed the SVG elements into the site. All brand icons are copyright their respective owners.
 
-# Attribution-ShareAlike 4.0 International
+---
+
+## creative commons Attribution-ShareAlike 4.0 International
 
 Creative Commons Corporation (“Creative Commons”) is not a law firm and does not provide legal services or legal advice. Distribution of Creative Commons public licenses does not create a lawyer-client or other relationship. Creative Commons makes its licenses and related information available on an “as-is” basis. Creative Commons gives no warranties regarding its licenses, any material licensed under their terms and conditions, or any related information. Creative Commons disclaims all liability for damages resulting from their use to the fullest extent possible.
 
diff --git a/_includes/head.html b/_includes/head.html
index cb2c719..4c2e567 100644
--- a/_includes/head.html
+++ b/_includes/head.html
@@ -39,10 +39,6 @@
     <meta property="og:image" content="{{image}}"/>
 {% endif %}
 
-<link rel="stylesheet" href="/fa/css/fontawesome.min.css">
-<link rel="stylesheet" href="/fa/css/brands.min.css">
-<link rel="stylesheet" href="/fa/css/solid.min.css">
-
 <link rel="stylesheet" href="/css/fnoots.css"/>
 <link rel="stylesheet" href="/css/site.css"/>
 <link rel="stylesheet" href="/css/sidebar.css"/>
\ No newline at end of file
diff --git a/_includes/sidebar.html b/_includes/sidebar.html
index 8ee79eb..5f7fd27 100644
--- a/_includes/sidebar.html
+++ b/_includes/sidebar.html
@@ -7,25 +7,34 @@
         <li>{% include flag.html color="magenta" name="About" url="/About" %}</li>
     </ul>
 
-    <ul compact id="navLinks" class="fa-ul">
+    <ul compact id="navLinks">
         <li>
             <a href="https://github.com/drewcassidy">
-                <i class="fab fa-li fa-github" aria-hidden="true"></i>Github
+                <svg aria-hidden="true" height=1em focusable="false" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 496 512">
+                    <path fill="currentColor" d="M165.9 397.4c0 2-2.3 3.6-5.2 3.6-3.3.3-5.6-1.3-5.6-3.6 0-2 2.3-3.6 5.2-3.6 3-.3 5.6 1.3 5.6 3.6zm-31.1-4.5c-.7 2 1.3 4.3 4.3 4.9 2.6 1 5.6 0 6.2-2s-1.3-4.3-4.3-5.2c-2.6-.7-5.5.3-6.2 2.3zm44.2-1.7c-2.9.7-4.9 2.6-4.6 4.9.3 2 2.9 3.3 5.9 2.6 2.9-.7 4.9-2.6 4.6-4.6-.3-1.9-3-3.2-5.9-2.9zM244.8 8C106.1 8 0 113.3 0 252c0 110.9 69.8 205.8 169.5 239.2 12.8 2.3 17.3-5.6 17.3-12.1 0-6.2-.3-40.4-.3-61.4 0 0-70 15-84.7-29.8 0 0-11.4-29.1-27.8-36.6 0 0-22.9-15.7 1.6-15.4 0 0 24.9 2 38.6 25.8 21.9 38.6 58.6 27.5 72.9 20.9 2.3-16 8.8-27.1 16-33.7-55.9-6.2-112.3-14.3-112.3-110.5 0-27.5 7.6-41.3 23.6-58.9-2.6-6.5-11.1-33.3 2.6-67.9 20.9-6.5 69 27 69 27 20-5.6 41.5-8.5 62.8-8.5s42.8 2.9 62.8 8.5c0 0 48.1-33.6 69-27 13.7 34.7 5.2 61.4 2.6 67.9 16 17.7 25.8 31.5 25.8 58.9 0 96.5-58.9 104.2-114.8 110.5 9.2 7.9 17 22.9 17 46.4 0 33.7-.3 75.4-.3 83.6 0 6.5 4.6 14.4 17.3 12.1C428.2 457.8 496 362.9 496 252 496 113.3 383.5 8 244.8 8zM97.2 352.9c-1.3 1-1 3.3.7 5.2 1.6 1.6 3.9 2.3 5.2 1 1.3-1 1-3.3-.7-5.2-1.6-1.6-3.9-2.3-5.2-1zm-10.8-8.1c-.7 1.3.3 2.9 2.3 3.9 1.6 1 3.6.7 4.3-.7.7-1.3-.3-2.9-2.3-3.9-2-.6-3.6-.3-4.3.7zm32.4 35.6c-1.6 1.3-1 4.3 1.3 6.2 2.3 2.3 5.2 2.6 6.5 1 1.3-1.3.7-4.3-1.3-6.2-2.2-2.3-5.2-2.6-6.5-1zm-11.4-14.7c-1.6 1-1.6 3.6 0 5.9 1.6 2.3 4.3 3.3 5.6 2.3 1.6-1.3 1.6-3.9 0-6.2-1.4-2.3-4-3.3-5.6-2z"></path>
+                </svg> Github
             </a>
         </li>
          <li>
             <a rel="me" href="https://cybre.space/@cinebox">
-                <i class="fab fa-li fa-mastodon" aria-hidden="true"></i> Mastodon
+                <svg aria-hidden="true" height=1em focusable="false" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 448 512">
+                    <path fill="currentColor" d="M433 179.11c0-97.2-63.71-125.7-63.71-125.7-62.52-28.7-228.56-28.4-290.48 0 0 0-63.72 28.5-63.72 125.7 0 115.7-6.6 259.4 105.63 289.1 40.51 10.7 75.32 13 103.33 11.4 50.81-2.8 79.32-18.1 79.32-18.1l-1.7-36.9s-36.31 11.4-77.12 10.1c-40.41-1.4-83-4.4-89.63-54a102.54 102.54 0 0 1-.9-13.9c85.63 20.9 158.65 9.1 178.75 6.7 56.12-6.7 105-41.3 111.23-72.9 9.8-49.8 9-121.5 9-121.5zm-75.12 125.2h-46.63v-114.2c0-49.7-64-51.6-64 6.9v62.5h-46.33V197c0-58.5-64-56.6-64-6.9v114.2H90.19c0-122.1-5.2-147.9 18.41-175 25.9-28.9 79.82-30.8 103.83 6.1l11.6 19.5 11.6-19.5c24.11-37.1 78.12-34.8 103.83-6.1 23.71 27.3 18.4 53 18.4 175z"></path>
+                </svg> Mastodon
             </a>
         </li>
         <li>
             <a href="https://twitter.com/AndrewNCassidy">
-                <i class="fab fa-li fa-twitter" aria-hidden="true"></i> Twitter
+                 <svg aria-hidden="true" height=1em focusable="false" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512">
+                    <path fill="currentColor" d="M459.37 151.716c.325 4.548.325 9.097.325 13.645 0 138.72-105.583 298.558-298.558 298.558-59.452 0-114.68-17.219-161.137-47.106 8.447.974 16.568 1.299 25.34 1.299 49.055 0 94.213-16.568 130.274-44.832-46.132-.975-84.792-31.188-98.112-72.772 6.498.974 12.995 1.624 19.818 1.624 9.421 0 18.843-1.3 27.614-3.573-48.081-9.747-84.143-51.98-84.143-102.985v-1.299c13.969 7.797 30.214 12.67 47.431 13.319-28.264-18.843-46.781-51.005-46.781-87.391 0-19.492 5.197-37.36 14.294-52.954 51.655 63.675 129.3 105.258 216.365 109.807-1.624-7.797-2.599-15.918-2.599-24.04 0-57.828 46.782-104.934 104.934-104.934 30.213 0 57.502 12.67 76.67 33.137 23.715-4.548 46.456-13.32 66.599-25.34-7.798 24.366-24.366 44.833-46.132 57.827 21.117-2.273 41.584-8.122 60.426-16.243-14.292 20.791-32.161 39.308-52.628 54.253z"></path>
+                </svg> Twitter
+
             </a>
         </li>
         <li>
             <a href="https://github.com/drewcassidy/drewcassidy.github.io">
-                <i class="fas fa-li fa-code" aria-hidden="true"></i> This Site
+                <svg aria-hidden="true" height=1em focusable="false" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 640 512">
+                    <path fill="currentColor" d="M278.9 511.5l-61-17.7c-6.4-1.8-10-8.5-8.2-14.9L346.2 8.7c1.8-6.4 8.5-10 14.9-8.2l61 17.7c6.4 1.8 10 8.5 8.2 14.9L293.8 503.3c-1.9 6.4-8.5 10.1-14.9 8.2zm-114-112.2l43.5-46.4c4.6-4.9 4.3-12.7-.8-17.2L117 256l90.6-79.7c5.1-4.5 5.5-12.3.8-17.2l-43.5-46.4c-4.5-4.8-12.1-5.1-17-.5L3.8 247.2c-5.1 4.7-5.1 12.8 0 17.5l144.1 135.1c4.9 4.6 12.5 4.4 17-.5zm327.2.6l144.1-135.1c5.1-4.7 5.1-12.8 0-17.5L492.1 112.1c-4.8-4.5-12.4-4.3-17 .5L431.6 159c-4.6 4.9-4.3 12.7.8 17.2L523 256l-90.6 79.7c-5.1 4.5-5.5 12.3-.8 17.2l43.5 46.4c4.5 4.9 12.1 5.1 17 .6z"></path>
+                </svg> This Site
             </a>
         </li>
     </ul>
diff --git a/_layouts/post.html b/_layouts/post.html
index 9f2cfa6..0cc6f90 100644
--- a/_layouts/post.html
+++ b/_layouts/post.html
@@ -22,13 +22,13 @@
             <span class="slash">/</span>
             <a href="/Blog" class="dir">Blog</a>
             <span class="slash">/</span>
+            <span id="post-title">{{ page.title }}</span>
         </header>
 
         <div id="box">
             {% include sidebar.html %}
 
             <main id="content">
-                <h1 class="post-title">{{ page.title }}</h1>
 
                 {% include post-info.html tags = page.tags date=page.date%}
 
diff --git a/css/sidebar.scss b/css/sidebar.scss
index 83f59b6..1a7c5d9 100644
--- a/css/sidebar.scss
+++ b/css/sidebar.scss
@@ -34,12 +34,18 @@ $mobile-width: {{ site.mobile-width }};
 
 #navLinks {
     display: block;
-    padding: {
-        left: 10px;
-    }
+    list-style-type: none;
+    margin-left: 2.5em;
+    padding-left: 0;
     color: $subtle;
     font-family: $sidebar-font;
+
+    li {
+        position: relative;
+    }
+
     a {
+        vertical-align: 10%;
         color: $sidebar-link-text;
         text-decoration: none;
         @include prefix-group(( transition-duration: $animate-time, transition-property: color, ), webkit moz o);
@@ -48,6 +54,14 @@ $mobile-width: {{ site.mobile-width }};
         color: $sidebar-link-hover;
         text-decoration: underline;
     }
+
+    svg {
+        left: -2em;
+        position: absolute;
+        text-align: center;
+        width: 2em;
+    }
+
 }
 
 .flagButton,
diff --git a/css/site.scss b/css/site.scss
index 8bc59e3..f0cef67 100644
--- a/css/site.scss
+++ b/css/site.scss
@@ -115,6 +115,9 @@ header {
             size: 36px;
         }
     }
+    #post-title {
+        display: inline-block;
+    }
 }
 
 
diff --git a/fa b/fa
deleted file mode 160000
index 299abb1..0000000
--- a/fa
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 299abb1fb101f4e1cfd1d2fccc461782ff84b13d
diff --git a/svg/code-solid.svg b/svg/code-solid.svg
new file mode 100644
index 0000000..db82c3c
--- /dev/null
+++ b/svg/code-solid.svg
@@ -0,0 +1 @@
+<svg aria-hidden="true" focusable="false" data-prefix="fas" data-icon="code" class="svg-inline--fa fa-code fa-w-20" role="img" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 640 512"><path fill="currentColor" d="M278.9 511.5l-61-17.7c-6.4-1.8-10-8.5-8.2-14.9L346.2 8.7c1.8-6.4 8.5-10 14.9-8.2l61 17.7c6.4 1.8 10 8.5 8.2 14.9L293.8 503.3c-1.9 6.4-8.5 10.1-14.9 8.2zm-114-112.2l43.5-46.4c4.6-4.9 4.3-12.7-.8-17.2L117 256l90.6-79.7c5.1-4.5 5.5-12.3.8-17.2l-43.5-46.4c-4.5-4.8-12.1-5.1-17-.5L3.8 247.2c-5.1 4.7-5.1 12.8 0 17.5l144.1 135.1c4.9 4.6 12.5 4.4 17-.5zm327.2.6l144.1-135.1c5.1-4.7 5.1-12.8 0-17.5L492.1 112.1c-4.8-4.5-12.4-4.3-17 .5L431.6 159c-4.6 4.9-4.3 12.7.8 17.2L523 256l-90.6 79.7c-5.1 4.5-5.5 12.3-.8 17.2l43.5 46.4c4.5 4.9 12.1 5.1 17 .6z"></path></svg>
\ No newline at end of file
diff --git a/svg/github-brands.svg b/svg/github-brands.svg
new file mode 100644
index 0000000..7870c06
--- /dev/null
+++ b/svg/github-brands.svg
@@ -0,0 +1 @@
+<svg aria-hidden="true" focusable="false" data-prefix="fab" data-icon="github" class="svg-inline--fa fa-github fa-w-16" role="img" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 496 512"><path fill="currentColor" d="M165.9 397.4c0 2-2.3 3.6-5.2 3.6-3.3.3-5.6-1.3-5.6-3.6 0-2 2.3-3.6 5.2-3.6 3-.3 5.6 1.3 5.6 3.6zm-31.1-4.5c-.7 2 1.3 4.3 4.3 4.9 2.6 1 5.6 0 6.2-2s-1.3-4.3-4.3-5.2c-2.6-.7-5.5.3-6.2 2.3zm44.2-1.7c-2.9.7-4.9 2.6-4.6 4.9.3 2 2.9 3.3 5.9 2.6 2.9-.7 4.9-2.6 4.6-4.6-.3-1.9-3-3.2-5.9-2.9zM244.8 8C106.1 8 0 113.3 0 252c0 110.9 69.8 205.8 169.5 239.2 12.8 2.3 17.3-5.6 17.3-12.1 0-6.2-.3-40.4-.3-61.4 0 0-70 15-84.7-29.8 0 0-11.4-29.1-27.8-36.6 0 0-22.9-15.7 1.6-15.4 0 0 24.9 2 38.6 25.8 21.9 38.6 58.6 27.5 72.9 20.9 2.3-16 8.8-27.1 16-33.7-55.9-6.2-112.3-14.3-112.3-110.5 0-27.5 7.6-41.3 23.6-58.9-2.6-6.5-11.1-33.3 2.6-67.9 20.9-6.5 69 27 69 27 20-5.6 41.5-8.5 62.8-8.5s42.8 2.9 62.8 8.5c0 0 48.1-33.6 69-27 13.7 34.7 5.2 61.4 2.6 67.9 16 17.7 25.8 31.5 25.8 58.9 0 96.5-58.9 104.2-114.8 110.5 9.2 7.9 17 22.9 17 46.4 0 33.7-.3 75.4-.3 83.6 0 6.5 4.6 14.4 17.3 12.1C428.2 457.8 496 362.9 496 252 496 113.3 383.5 8 244.8 8zM97.2 352.9c-1.3 1-1 3.3.7 5.2 1.6 1.6 3.9 2.3 5.2 1 1.3-1 1-3.3-.7-5.2-1.6-1.6-3.9-2.3-5.2-1zm-10.8-8.1c-.7 1.3.3 2.9 2.3 3.9 1.6 1 3.6.7 4.3-.7.7-1.3-.3-2.9-2.3-3.9-2-.6-3.6-.3-4.3.7zm32.4 35.6c-1.6 1.3-1 4.3 1.3 6.2 2.3 2.3 5.2 2.6 6.5 1 1.3-1.3.7-4.3-1.3-6.2-2.2-2.3-5.2-2.6-6.5-1zm-11.4-14.7c-1.6 1-1.6 3.6 0 5.9 1.6 2.3 4.3 3.3 5.6 2.3 1.6-1.3 1.6-3.9 0-6.2-1.4-2.3-4-3.3-5.6-2z"></path></svg>
\ No newline at end of file
diff --git a/svg/mastodon-brands.svg b/svg/mastodon-brands.svg
new file mode 100644
index 0000000..4257e7c
--- /dev/null
+++ b/svg/mastodon-brands.svg
@@ -0,0 +1 @@
+<svg aria-hidden="true" focusable="false" data-prefix="fab" data-icon="mastodon" class="svg-inline--fa fa-mastodon fa-w-14" role="img" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 448 512"><path fill="currentColor" d="M433 179.11c0-97.2-63.71-125.7-63.71-125.7-62.52-28.7-228.56-28.4-290.48 0 0 0-63.72 28.5-63.72 125.7 0 115.7-6.6 259.4 105.63 289.1 40.51 10.7 75.32 13 103.33 11.4 50.81-2.8 79.32-18.1 79.32-18.1l-1.7-36.9s-36.31 11.4-77.12 10.1c-40.41-1.4-83-4.4-89.63-54a102.54 102.54 0 0 1-.9-13.9c85.63 20.9 158.65 9.1 178.75 6.7 56.12-6.7 105-41.3 111.23-72.9 9.8-49.8 9-121.5 9-121.5zm-75.12 125.2h-46.63v-114.2c0-49.7-64-51.6-64 6.9v62.5h-46.33V197c0-58.5-64-56.6-64-6.9v114.2H90.19c0-122.1-5.2-147.9 18.41-175 25.9-28.9 79.82-30.8 103.83 6.1l11.6 19.5 11.6-19.5c24.11-37.1 78.12-34.8 103.83-6.1 23.71 27.3 18.4 53 18.4 175z"></path></svg>
\ No newline at end of file
diff --git a/svg/twitter-brands.svg b/svg/twitter-brands.svg
new file mode 100644
index 0000000..9ac9e0b
--- /dev/null
+++ b/svg/twitter-brands.svg
@@ -0,0 +1 @@
+<svg aria-hidden="true" focusable="false" data-prefix="fab" data-icon="twitter" class="svg-inline--fa fa-twitter fa-w-16" role="img" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path fill="currentColor" d="M459.37 151.716c.325 4.548.325 9.097.325 13.645 0 138.72-105.583 298.558-298.558 298.558-59.452 0-114.68-17.219-161.137-47.106 8.447.974 16.568 1.299 25.34 1.299 49.055 0 94.213-16.568 130.274-44.832-46.132-.975-84.792-31.188-98.112-72.772 6.498.974 12.995 1.624 19.818 1.624 9.421 0 18.843-1.3 27.614-3.573-48.081-9.747-84.143-51.98-84.143-102.985v-1.299c13.969 7.797 30.214 12.67 47.431 13.319-28.264-18.843-46.781-51.005-46.781-87.391 0-19.492 5.197-37.36 14.294-52.954 51.655 63.675 129.3 105.258 216.365 109.807-1.624-7.797-2.599-15.918-2.599-24.04 0-57.828 46.782-104.934 104.934-104.934 30.213 0 57.502 12.67 76.67 33.137 23.715-4.548 46.456-13.32 66.599-25.34-7.798 24.366-24.366 44.833-46.132 57.827 21.117-2.273 41.584-8.122 60.426-16.243-14.292 20.791-32.161 39.308-52.628 54.253z"></path></svg>
\ No newline at end of file