Merge pull request nateberkopec#27 from enishitech/remove-jekyll-assets

Remove jekyll-assets

Gemfile

@@ -2,10 +2,6 @@ source "https://rubygems.org"
 
 gem "jekyll", "~> 3.0"
 gem "redcarpet", ">= 2.0"
-gem "jekyll-assets"
-gem "sprockets", "~> 3.0"
-gem "sass"
 gem "foreman"
-gem "uglifier"
 gem "mini_racer"
 gem "bootstrap-sass", "3.3.5.1"

Gemfile.lock

@@ -1,11 +1,6 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (5.2.4.4)
-      concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 0.7, < 2)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
     addressable (2.7.0)
       public_suffix (>= 2.0.2, < 5.0)
     autoprefixer-rails (10.0.1.0)
@@ -20,9 +15,6 @@ GEM
       http_parser.rb (~> 0.6.0)
     eventmachine (1.2.7)
     execjs (2.7.0)
-    extras (0.3.0)
-      forwardable-extended (~> 2.5)
-    fastimage (2.2.0)
     ffi (1.13.1)
     foreman (0.87.2)
     forwardable-extended (2.6.0)
@@ -42,47 +34,23 @@ GEM
       pathutil (~> 0.9)
       rouge (>= 1.7, < 4)
       safe_yaml (~> 1.0)
-    jekyll-assets (3.0.12)
-      activesupport (~> 5.0)
-      execjs (~> 2.7)
-      extras (~> 0.2)
-      fastimage (~> 2.0, >= 1.8)
-      jekyll (>= 3.5, < 4.0)
-      jekyll-sanity (~> 1.2)
-      liquid-tag-parser (~> 1.0)
-      nokogiri (~> 1.8)
-      pathutil (~> 0.16)
-      sprockets (>= 3.3, < 4.1.beta)
-    jekyll-sanity (1.6.0)
-      jekyll (>= 3.1, < 5.0)
-      pathutil (~> 0.16)
     jekyll-sass-converter (1.5.2)
       sass (~> 3.4)
     jekyll-watch (2.2.1)
       listen (~> 3.0)
     kramdown (2.3.0)
       rexml
-    libv8-node (16.19.0.1)
+    libv8-node (16.19.0.1-arm64-darwin)
     liquid (4.0.3)
-    liquid-tag-parser (1.9.0)
-      extras (~> 0.3)
-      liquid (>= 3.0, < 5.0)
     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.8.2)
     mini_racer (0.6.4)
       libv8-node (~> 16.19.0.0)
-    minitest (5.14.2)
-    nokogiri (1.15.3)
-      mini_portile2 (~> 2.8.2)
-      racc (~> 1.4)
     pathutil (0.16.2)
       forwardable-extended (~> 2.6)
     public_suffix (4.0.6)
-    racc (1.7.1)
-    rack (2.2.3)
     rb-fsevent (0.10.4)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
@@ -95,14 +63,6 @@ GEM
     sass-listen (4.0.0)
       rb-fsevent (~> 0.9, >= 0.9.4)
       rb-inotify (~> 0.9, >= 0.9.7)
-    sprockets (3.7.2)
-      concurrent-ruby (~> 1.0)
-      rack (> 1, < 3)
-    thread_safe (0.3.6)
-    tzinfo (1.2.7)
-      thread_safe (~> 0.1)
-    uglifier (4.2.0)
-      execjs (>= 0.3.0, < 3)
 
 PLATFORMS
   ruby
@@ -111,12 +71,8 @@ DEPENDENCIES
   bootstrap-sass (= 3.3.5.1)
   foreman
   jekyll (~> 3.0)
-  jekyll-assets
   mini_racer
   redcarpet (>= 2.0)
-  sass
-  sprockets (~> 3.0)
-  uglifier
 
 BUNDLED WITH
    2.1.4

_config.yml

@@ -26,22 +26,7 @@ git:
   branch: master
 
 plugins:
-  - jekyll-assets
   - bootstrap-sass
 
-assets:
-  js_compressor:  uglifier
-  css_compressor: sass
-  prefix: "/assets"
-  assets:
-    - "*.png"
-    - "*.jpg"
-    - "base.css"
-    - "application.js"
-  digest: true
-  sources:
-    - "assets"
-    - "assets/css"
-    - "assets/img"
-    - "assets/js"
-    - "_sass"
+sass:
+  style: compressed

_includes/head.html

@@ -5,7 +5,7 @@
   <title>{% if page.title %}{{ page.title }}{% else %}{{ site.title }}{% endif %}</title>
   <meta name="description" content="{% if page.excerpt %}{{ page.excerpt | strip_html | strip_newlines | truncate: 160 }}{% else %}{{ site.description }}{% endif %}">
 
-  {% asset css/base.css %}
+  <link href="/assets/css/base.css" rel="stylesheet">
 
   <link href='//fonts.gstatic.com' rel='preconnect' crossorigin>
   <link href='//fonts.googleapis.com/css?family=Oswald:400&text=NATE%20MAKES%20APPS%20FAST' rel='stylesheet'>

_posts/2020-01-02-growth-over-results.md

@@ -36,7 +36,7 @@ Frequency first, and no more long-term goals.
 
 My todo-list now looks something like this, every day:
 
-{% asset "img/posts/dailytodo.png"  %}
+<img src="/assets/img/posts/dailytodo.png">
 
 Note that I cannot track (at least not obviously) how many days in a row I have done any particular task. Notice how there are no specific goals: write X words, meditate X amount, practice Japanese for X minutes, either or a daily or monthly or other time basis. I've got some labels there to help me budget my time for the day, but they're not mandatory. There are no requirements for the duration of each task or the quality of the execution.
 

assets/css/base.scss

@@ -1,3 +1,6 @@
+---
+---
+
 // Core variables and mixins
 @import "settings";
 @import "bootstrap/mixins";