Finished adjusting to SASS formatting

Author: evansavage

.gitignore

@@ -3,6 +3,7 @@ _gh_pages
 _site
 .ruby-version
 .sass-cache
+Gemfile.lock
 
 # Numerous always-ignore extensions
 *.diff

Gemfile

@@ -8,8 +8,7 @@ source "https://rubygems.org"
 #
 # This will help ensure the proper Jekyll version is running.
 # Happy Jekylling!
-gem "jekyll", "~> 3.7.3"
-
+gem "jekyll", "~> 3.8.5"
 # This is the default theme for new Jekyll sites. You may change this to anything you like.
 
 gem "minima", "~> 2.0"

Gemfile.lock

@@ -1,8 +1,8 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    addressable (2.6.0)
-      public_suffix (>= 2.0.2, < 4.0)
+    addressable (2.7.0)
+      public_suffix (>= 2.0.2, < 5.0)
     awesome_print (1.8.0)
     blankslate (3.1.3)
     colorator (1.1.0)
@@ -14,14 +14,12 @@ GEM
       eventmachine (>= 0.12.9)
       http_parser.rb (~> 0.6.0)
     eventmachine (1.2.7)
-    eventmachine (1.2.7-x64-mingw32)
-    ffi (1.11.1)
-    ffi (1.11.1-x64-mingw32)
+    ffi (1.12.1)
     forwardable-extended (2.6.0)
     http_parser.rb (0.6.0)
     i18n (0.9.5)
       concurrent-ruby (~> 1.0)
-    jekyll (3.7.4)
+    jekyll (3.8.6)
       addressable (~> 2.4)
       colorator (~> 1.0)
       em-websocket (~> 0.5)
@@ -34,7 +32,7 @@ GEM
       pathutil (~> 0.9)
       rouge (>= 1.7, < 4)
       safe_yaml (~> 1.0)
-    jekyll-feed (0.12.1)
+    jekyll-feed (0.13.0)
       jekyll (>= 3.7, < 5.0)
     jekyll-paginate (1.1.0)
     jekyll-redirect-from (0.15.0)
@@ -51,28 +49,24 @@ GEM
     kramdown (1.17.0)
     linear (0.0.0)
     liquid (4.0.3)
-    listen (3.1.5)
-      rb-fsevent (~> 0.9, >= 0.9.4)
-      rb-inotify (~> 0.9, >= 0.9.7)
-      ruby_dep (~> 1.2)
+    listen (3.2.1)
+      rb-fsevent (~> 0.10, >= 0.10.3)
+      rb-inotify (~> 0.9, >= 0.9.10)
     mercenary (0.3.6)
     mini_portile2 (2.4.0)
     minima (2.5.1)
       jekyll (>= 3.5, < 5.0)
       jekyll-feed (~> 0.9)
       jekyll-seo-tag (~> 2.1)
-    nokogiri (1.10.4)
-      mini_portile2 (~> 2.4.0)
-    nokogiri (1.10.4-x64-mingw32)
+    nokogiri (1.10.7)
       mini_portile2 (~> 2.4.0)
     pathutil (0.16.2)
       forwardable-extended (~> 2.6)
-    public_suffix (3.1.1)
+    public_suffix (4.0.3)
     rb-fsevent (0.10.3)
-    rb-inotify (0.10.0)
+    rb-inotify (0.10.1)
       ffi (~> 1.0)
-    rouge (3.9.0)
-    ruby_dep (1.5.0)
+    rouge (3.15.0)
     safe_yaml (1.0.5)
     sass (3.7.4)
       sass-listen (~> 4.0.0)
@@ -81,18 +75,13 @@ GEM
       rb-inotify (~> 0.9, >= 0.9.7)
     subtle (1.2.0)
       blankslate
-    tzinfo (2.0.0)
-      concurrent-ruby (~> 1.0)
-    tzinfo-data (1.2019.2)
-      tzinfo (>= 1.0.0)
 
 PLATFORMS
   ruby
-  x64-mingw32
 
 DEPENDENCIES
   contrast
-  jekyll (~> 3.7.3)
+  jekyll (~> 3.8.5)
   jekyll-feed (~> 0.6)
   jekyll-paginate
   jekyll-redirect-from
@@ -103,4 +92,4 @@ DEPENDENCIES
   tzinfo-data
 
 BUNDLED WITH
-   2.0.1
+   2.0.2

_includes/head.html

@@ -22,9 +22,10 @@
   <!-- <link rel="preload" href="{{ '/assets/css/main.css' | relative_url }}" as="style" onload="this.rel='stylesheet'"> -->
 
   <!-- CSS -->
-  <link rel="stylesheet" href="{{ site.url }}/public/css/poole.css">
+  <!-- <link rel="stylesheet" href="{{ site.url }}/public/css/poole.css">
   <link rel="stylesheet" href="{{ site.url }}/public/css/lanyon2.css">
-  <link rel="stylesheet" type="text/css" href="{{ site.url }}/public/css/bootstrap.css">
+  <link rel="stylesheet" type="text/css" href="{{ site.url }}/public/css/bootstrap.css"> -->
+  <link rel="stylesheet" href="{{ '/assets/css/main.css' | relative_url }}" />
   <!-- <noscript><link rel="stylesheet" href="{{ '/assets/css/main.css' | relative_url }}"></noscript> -->
   <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=PT+Serif:400,400italic,700%7CPT+Sans:400">
   <link href="https://fonts.googleapis.com/css?family=Montserrat|Raleway:300,400,500" rel="stylesheet">

public/css/main.scss assets/css/main.scsspublic/css/main.scss renamed to assets/css/main.scss

@@ -3,6 +3,7 @@
 # only Main files contain this front matter, not partials.
 ---
 
-@import "bootstrap";
-@import "lanyon2";
+
 @import "poole";
+@import "lanyon2";
+@import "bootstrap";