restore social links

.github/workflows/jekyll.yml

@@ -36,7 +36,7 @@ jobs:
       - name: Setup Ruby
         uses: ruby/setup-ruby@943103cae7d3f1bb1e4951d5fcc7928b40e4b742 # v1.177.1
         with:
-          ruby-version: "3.1" # Not needed with a .ruby-version file
+          ruby-version: ".ruby-version" # Not needed with a .ruby-version file
           bundler-cache: true # runs 'bundle install' and caches installed gems automatically
           cache-version: 0 # Increment this number if you need to re-download cached gems
       - name: Setup Pages

.gitlab-ci.yml

@@ -11,7 +11,7 @@ cache:
     - ${CI_PROJECT_DIR}/bundle
 
 before_script:
-  - apk add --no-cache ruby ruby-dev ruby-bundler make gcc g++ musl-dev
+  - apk add --no-cache ruby ruby-dev ruby-bundler make gcc g++ musl-dev build-base libffi-dev libxml2-dev
   - bundle install
 
 test:

.ruby-version

@@ -0,0 +1 @@
+3.3

Gemfile

@@ -1,6 +1,14 @@
 source "https://rubygems.org"
 # For now this is a GitHub Pages hosted website.
 #   Ref: https://github.com/Mikaela/mikaela.github.io/issues/153
-gem "github-pages"
+#gem "github-pages"
+gem "jekyll"
+# The default theme
+gem "minima"
+# Extensions enabled
+gem "jekyll-feed"
+gem "jekyll-mentions"
+gem "jekyll-redirect-from"
+gem "jekyll-sitemap"
 # Required for `bundle exec jekyll serve`
 gem "webrick"

Gemfile.lock

@@ -15,196 +15,71 @@ GEM
       public_suffix (>= 2.0.2, < 6.0)
     base64 (0.2.0)
     bigdecimal (3.1.8)
-    coffee-script (2.4.1)
-      coffee-script-source
-      execjs
-    coffee-script-source (1.12.2)
     colorator (1.1.0)
-    commonmarker (0.23.10)
     concurrent-ruby (1.2.3)
     connection_pool (2.4.1)
-    dnsruby (1.72.1)
-      simpleidn (~> 0.2.1)
     drb (2.2.1)
     em-websocket (0.5.3)
       eventmachine (>= 0.12.9)
       http_parser.rb (~> 0)
-    ethon (0.16.0)
-      ffi (>= 1.15.0)
     eventmachine (1.2.7)
-    execjs (2.9.1)
-    faraday (2.9.0)
-      faraday-net_http (>= 2.0, < 3.2)
-    faraday-net_http (3.1.0)
-      net-http
     ffi (1.16.3)
     forwardable-extended (2.6.0)
-    gemoji (4.1.0)
+    google-protobuf (4.27.0)
-    github-pages (231)
+      bigdecimal
-      github-pages-health-check (= 1.18.2)
+      rake (>= 13)
-      jekyll (= 3.9.5)
+    google-protobuf (4.27.0-aarch64-linux)
-      jekyll-avatar (= 0.8.0)
+      bigdecimal
-      jekyll-coffeescript (= 1.2.2)
+      rake (>= 13)
-      jekyll-commonmark-ghpages (= 0.4.0)
+    google-protobuf (4.27.0-arm64-darwin)
-      jekyll-default-layout (= 0.1.5)
+      bigdecimal
-      jekyll-feed (= 0.17.0)
+      rake (>= 13)
-      jekyll-gist (= 1.5.0)
+    google-protobuf (4.27.0-x86-linux)
-      jekyll-github-metadata (= 2.16.1)
+      bigdecimal
-      jekyll-include-cache (= 0.2.1)
+      rake (>= 13)
-      jekyll-mentions (= 1.6.0)
+    google-protobuf (4.27.0-x86_64-darwin)
-      jekyll-optional-front-matter (= 0.3.2)
+      bigdecimal
-      jekyll-paginate (= 1.1.0)
+      rake (>= 13)
-      jekyll-readme-index (= 0.3.0)
+    google-protobuf (4.27.0-x86_64-linux)
-      jekyll-redirect-from (= 0.16.0)
+      bigdecimal
-      jekyll-relative-links (= 0.6.1)
+      rake (>= 13)
-      jekyll-remote-theme (= 0.4.3)
-      jekyll-sass-converter (= 1.5.2)
-      jekyll-seo-tag (= 2.8.0)
-      jekyll-sitemap (= 1.4.0)
-      jekyll-swiss (= 1.0.0)
-      jekyll-theme-architect (= 0.2.0)
-      jekyll-theme-cayman (= 0.2.0)
-      jekyll-theme-dinky (= 0.2.0)
-      jekyll-theme-hacker (= 0.2.0)
-      jekyll-theme-leap-day (= 0.2.0)
-      jekyll-theme-merlot (= 0.2.0)
-      jekyll-theme-midnight (= 0.2.0)
-      jekyll-theme-minimal (= 0.2.0)
-      jekyll-theme-modernist (= 0.2.0)
-      jekyll-theme-primer (= 0.6.0)
-      jekyll-theme-slate (= 0.2.0)
-      jekyll-theme-tactile (= 0.2.0)
-      jekyll-theme-time-machine (= 0.2.0)
-      jekyll-titles-from-headings (= 0.5.3)
-      jemoji (= 0.13.0)
-      kramdown (= 2.4.0)
-      kramdown-parser-gfm (= 1.1.0)
-      liquid (= 4.0.4)
-      mercenary (~> 0.3)
-      minima (= 2.5.1)
-      nokogiri (>= 1.13.6, < 2.0)
-      rouge (= 3.30.0)
-      terminal-table (~> 1.4)
-    github-pages-health-check (1.18.2)
-      addressable (~> 2.3)
-      dnsruby (~> 1.60)
-      octokit (>= 4, < 8)
-      public_suffix (>= 3.0, < 6.0)
-      typhoeus (~> 1.3)
     html-pipeline (2.14.3)
       activesupport (>= 2)
       nokogiri (>= 1.4)
     http_parser.rb (0.8.0)
     i18n (1.14.5)
       concurrent-ruby (~> 1.0)
-    jekyll (3.9.5)
+    jekyll (4.3.3)
       addressable (~> 2.4)
       colorator (~> 1.0)
       em-websocket (~> 0.5)
-      i18n (>= 0.7, < 2)
+      i18n (~> 1.0)
-      jekyll-sass-converter (~> 1.0)
+      jekyll-sass-converter (>= 2.0, < 4.0)
       jekyll-watch (~> 2.0)
-      kramdown (>= 1.17, < 3)
+      kramdown (~> 2.3, >= 2.3.1)
+      kramdown-parser-gfm (~> 1.0)
       liquid (~> 4.0)
-      mercenary (~> 0.3.3)
+      mercenary (>= 0.3.6, < 0.5)
       pathutil (~> 0.9)
-      rouge (>= 1.7, < 4)
+      rouge (>= 3.0, < 5.0)
       safe_yaml (~> 1.0)
-    jekyll-avatar (0.8.0)
+      terminal-table (>= 1.8, < 4.0)
-      jekyll (>= 3.0, < 5.0)
+      webrick (~> 1.7)
-    jekyll-coffeescript (1.2.2)
-      coffee-script (~> 2.2)
-      coffee-script-source (~> 1.12)
-    jekyll-commonmark (1.4.0)
-      commonmarker (~> 0.22)
-    jekyll-commonmark-ghpages (0.4.0)
-      commonmarker (~> 0.23.7)
-      jekyll (~> 3.9.0)
-      jekyll-commonmark (~> 1.4.0)
-      rouge (>= 2.0, < 5.0)
-    jekyll-default-layout (0.1.5)
-      jekyll (>= 3.0, < 5.0)
     jekyll-feed (0.17.0)
       jekyll (>= 3.7, < 5.0)
-    jekyll-gist (1.5.0)
-      octokit (~> 4.2)
-    jekyll-github-metadata (2.16.1)
-      jekyll (>= 3.4, < 5.0)
-      octokit (>= 4, < 7, != 4.4.0)
-    jekyll-include-cache (0.2.1)
-      jekyll (>= 3.7, < 5.0)
     jekyll-mentions (1.6.0)
       html-pipeline (~> 2.3)
       jekyll (>= 3.7, < 5.0)
-    jekyll-optional-front-matter (0.3.2)
-      jekyll (>= 3.0, < 5.0)
-    jekyll-paginate (1.1.0)
-    jekyll-readme-index (0.3.0)
-      jekyll (>= 3.0, < 5.0)
     jekyll-redirect-from (0.16.0)
       jekyll (>= 3.3, < 5.0)
-    jekyll-relative-links (0.6.1)
+    jekyll-sass-converter (3.0.0)
-      jekyll (>= 3.3, < 5.0)
+      sass-embedded (~> 1.54)
-    jekyll-remote-theme (0.4.3)
-      addressable (~> 2.0)
-      jekyll (>= 3.5, < 5.0)
-      jekyll-sass-converter (>= 1.0, <= 3.0.0, != 2.0.0)
-      rubyzip (>= 1.3.0, < 3.0)
-    jekyll-sass-converter (1.5.2)
-      sass (~> 3.4)
     jekyll-seo-tag (2.8.0)
       jekyll (>= 3.8, < 5.0)
     jekyll-sitemap (1.4.0)
       jekyll (>= 3.7, < 5.0)
-    jekyll-swiss (1.0.0)
-    jekyll-theme-architect (0.2.0)
-      jekyll (> 3.5, < 5.0)
-      jekyll-seo-tag (~> 2.0)
-    jekyll-theme-cayman (0.2.0)
-      jekyll (> 3.5, < 5.0)
-      jekyll-seo-tag (~> 2.0)
-    jekyll-theme-dinky (0.2.0)
-      jekyll (> 3.5, < 5.0)
-      jekyll-seo-tag (~> 2.0)
-    jekyll-theme-hacker (0.2.0)
-      jekyll (> 3.5, < 5.0)
-      jekyll-seo-tag (~> 2.0)
-    jekyll-theme-leap-day (0.2.0)
-      jekyll (> 3.5, < 5.0)
-      jekyll-seo-tag (~> 2.0)
-    jekyll-theme-merlot (0.2.0)
-      jekyll (> 3.5, < 5.0)
-      jekyll-seo-tag (~> 2.0)
-    jekyll-theme-midnight (0.2.0)
-      jekyll (> 3.5, < 5.0)
-      jekyll-seo-tag (~> 2.0)
-    jekyll-theme-minimal (0.2.0)
-      jekyll (> 3.5, < 5.0)
-      jekyll-seo-tag (~> 2.0)
-    jekyll-theme-modernist (0.2.0)
-      jekyll (> 3.5, < 5.0)
-      jekyll-seo-tag (~> 2.0)
-    jekyll-theme-primer (0.6.0)
-      jekyll (> 3.5, < 5.0)
-      jekyll-github-metadata (~> 2.9)
-      jekyll-seo-tag (~> 2.0)
-    jekyll-theme-slate (0.2.0)
-      jekyll (> 3.5, < 5.0)
-      jekyll-seo-tag (~> 2.0)
-    jekyll-theme-tactile (0.2.0)
-      jekyll (> 3.5, < 5.0)
-      jekyll-seo-tag (~> 2.0)
-    jekyll-theme-time-machine (0.2.0)
-      jekyll (> 3.5, < 5.0)
-      jekyll-seo-tag (~> 2.0)
-    jekyll-titles-from-headings (0.5.3)
-      jekyll (>= 3.3, < 5.0)
     jekyll-watch (2.2.1)
       listen (~> 3.0)
-    jemoji (0.13.0)
-      gemoji (>= 3, < 5)
-      html-pipeline (~> 2.2)
-      jekyll (>= 3.0, < 5.0)
     kramdown (2.4.0)
       rexml
     kramdown-parser-gfm (1.1.0)
@@ -213,15 +88,17 @@ GEM
     listen (3.9.0)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
-    mercenary (0.3.6)
+    mercenary (0.4.0)
+    mini_portile2 (2.8.6)
     minima (2.5.1)
       jekyll (>= 3.5, < 5.0)
       jekyll-feed (~> 0.9)
       jekyll-seo-tag (~> 2.1)
     minitest (5.23.1)
     mutex_m (0.2.0)
-    net-http (0.4.1)
+    nokogiri (1.16.5)
-      uri
+      mini_portile2 (~> 2.8.2)
+      racc (~> 1.4)
     nokogiri (1.16.5-aarch64-linux)
       racc (~> 1.4)
     nokogiri (1.16.5-arm-linux)
@@ -234,51 +111,104 @@ GEM
       racc (~> 1.4)
     nokogiri (1.16.5-x86_64-linux)
       racc (~> 1.4)
-    octokit (4.25.1)
-      faraday (>= 1, < 3)
-      sawyer (~> 0.9)
     pathutil (0.16.2)
       forwardable-extended (~> 2.6)
     public_suffix (5.0.5)
     racc (1.8.0)
+    rake (13.2.1)
     rb-fsevent (0.11.2)
     rb-inotify (0.11.1)
       ffi (~> 1.0)
     rexml (3.2.8)
       strscan (>= 3.0.9)
-    rouge (3.30.0)
+    rouge (4.2.1)
-    rubyzip (2.3.2)
     safe_yaml (1.0.5)
-    sass (3.7.4)
+    sass-embedded (1.77.2)
-      sass-listen (~> 4.0.0)
+      google-protobuf (>= 3.25, < 5.0)
-    sass-listen (4.0.0)
+      rake (>= 13.0.0)
-      rb-fsevent (~> 0.9, >= 0.9.4)
+    sass-embedded (1.77.2-aarch64-linux-android)
-      rb-inotify (~> 0.9, >= 0.9.7)
+      google-protobuf (>= 3.25, < 5.0)
-    sawyer (0.9.2)
+    sass-embedded (1.77.2-aarch64-linux-gnu)
-      addressable (>= 2.3.5)
+      google-protobuf (>= 3.25, < 5.0)
-      faraday (>= 0.17.3, < 3)
+    sass-embedded (1.77.2-aarch64-linux-musl)
-    simpleidn (0.2.3)
+      google-protobuf (>= 3.25, < 5.0)
+    sass-embedded (1.77.2-aarch64-mingw-ucrt)
+      google-protobuf (>= 3.25, < 5.0)
+    sass-embedded (1.77.2-arm-linux-androideabi)
+      google-protobuf (>= 3.25, < 5.0)
+    sass-embedded (1.77.2-arm-linux-gnueabihf)
+      google-protobuf (>= 3.25, < 5.0)
+    sass-embedded (1.77.2-arm-linux-musleabihf)
+      google-protobuf (>= 3.25, < 5.0)
+    sass-embedded (1.77.2-arm64-darwin)
+      google-protobuf (>= 3.25, < 5.0)
+    sass-embedded (1.77.2-riscv64-linux-android)
+      google-protobuf (>= 3.25, < 5.0)
+    sass-embedded (1.77.2-riscv64-linux-gnu)
+      google-protobuf (>= 3.25, < 5.0)
+    sass-embedded (1.77.2-riscv64-linux-musl)
+      google-protobuf (>= 3.25, < 5.0)
+    sass-embedded (1.77.2-x86-cygwin)
+      google-protobuf (>= 3.25, < 5.0)
+    sass-embedded (1.77.2-x86-linux-android)
+      google-protobuf (>= 3.25, < 5.0)
+    sass-embedded (1.77.2-x86-linux-gnu)
+      google-protobuf (>= 3.25, < 5.0)
+    sass-embedded (1.77.2-x86-linux-musl)
+      google-protobuf (>= 3.25, < 5.0)
+    sass-embedded (1.77.2-x86-mingw-ucrt)
+      google-protobuf (>= 3.25, < 5.0)
+    sass-embedded (1.77.2-x86_64-cygwin)
+      google-protobuf (>= 3.25, < 5.0)
+    sass-embedded (1.77.2-x86_64-darwin)
+      google-protobuf (>= 3.25, < 5.0)
+    sass-embedded (1.77.2-x86_64-linux-android)
+      google-protobuf (>= 3.25, < 5.0)
+    sass-embedded (1.77.2-x86_64-linux-gnu)
+      google-protobuf (>= 3.25, < 5.0)
+    sass-embedded (1.77.2-x86_64-linux-musl)
+      google-protobuf (>= 3.25, < 5.0)
     strscan (3.1.0)
-    terminal-table (1.8.0)
+    terminal-table (3.0.2)
-      unicode-display_width (~> 1.1, >= 1.1.1)
+      unicode-display_width (>= 1.1.1, < 3)
-    typhoeus (1.4.1)
-      ethon (>= 0.9.0)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
-    unicode-display_width (1.8.0)
+    unicode-display_width (2.5.0)
-    uri (0.13.0)
     webrick (1.8.1)
 
 PLATFORMS
   aarch64-linux
-  arm-linux
+  aarch64-linux-android
+  aarch64-linux-gnu
+  aarch64-linux-musl
+  aarch64-mingw-ucrt
+  arm-linux-androideabi
+  arm-linux-gnueabihf
+  arm-linux-musleabihf
   arm64-darwin
+  riscv64-linux-android
+  riscv64-linux-gnu
+  riscv64-linux-musl
+  ruby
+  x86-cygwin
   x86-linux
+  x86-linux-android
+  x86-linux-gnu
+  x86-linux-musl
+  x86-mingw-ucrt
+  x86_64-cygwin
   x86_64-darwin
-  x86_64-linux
+  x86_64-linux-android
+  x86_64-linux-gnu
+  x86_64-linux-musl
 
 DEPENDENCIES
-  github-pages
+  jekyll
+  jekyll-feed
+  jekyll-mentions
+  jekyll-redirect-from
+  jekyll-sitemap
+  minima
   webrick
 
 BUNDLED WITH

_config.yml

@@ -12,8 +12,19 @@ baseurl: "" # the subpath of your site, e.g. /blog/
 #url: "https://www.aminda.eu" # the base hostname & protocol for your site
 url: "https://aminda.eu" # the base hostname & protocol for your site
 
+codeberg_username: Mikaela
+github_username: Mikaela
+linkedin_username: Aminda-eu
+mastodon:
+  username: Aminda
+  instance: sauna.social
+rss: Blog
+keybase_username: Mikaela
+telegram_username: AmindaEU
+
 # Build settings
 markdown: kramdown
+theme: minima
 #theme: jekyll-theme-midnight
 redcarpet:
   extensions:

_includes/footer.html

@@ -11,30 +11,7 @@
       </div>
 
       <div class="footer-col footer-col-2">
-        <ul class="social-media-list">
+        {%- include social.html -%}
-          {% if site.facebook_username %}
-          <li>
-            <a href="https://facebook.com/{{ site.facebook_username }}">
-              <span class="username">FB:{{ site.facebook_username }}</span>
-            </a>
-          </li>
-          {% endif %} {% if site.github_username %}
-          <li>
-            <a href="https://github.com/{{ site.github_username }}">
-              <span class="icon icon--github">
-                <svg viewBox="0 0 16 16">
-                  <path
-                    fill="#828282"
-                    d="M7.999,0.431c-4.285,0-7.76,3.474-7.76,7.761 c0,3.428,2.223,6.337,5.307,7.363c0.388,0.071,0.53-0.168,0.53-0.374c0-0.184-0.007-0.672-0.01-1.32 c-2.159,0.469-2.614-1.04-2.614-1.04c-0.353-0.896-0.862-1.135-0.862-1.135c-0.705-0.481,0.053-0.472,0.053-0.472 c0.779,0.055,1.189,0.8,1.189,0.8c0.692,1.186,1.816,0.843,2.258,0.645c0.071-0.502,0.271-0.843,0.493-1.037 C4.86,11.425,3.049,10.76,3.049,7.786c0-0.847,0.302-1.54,0.799-2.082C3.768,5.507,3.501,4.718,3.924,3.65 c0,0,0.652-0.209,2.134,0.796C6.677,4.273,7.34,4.187,8,4.184c0.659,0.003,1.323,0.089,1.943,0.261 c1.482-1.004,2.132-0.796,2.132-0.796c0.423,1.068,0.157,1.857,0.077,2.054c0.497,0.542,0.798,1.235,0.798,2.082 c0,2.981-1.814,3.637-3.543,3.829c0.279,0.24,0.527,0.713,0.527,1.437c0,1.037-0.01,1.874-0.01,2.129 c0,0.208,0.14,0.449,0.534,0.373c3.081-1.028,5.302-3.935,5.302-7.362C15.76,3.906,12.285,0.431,7.999,0.431z"
-                  />
-                </svg>
-              </span>
-
-              <span class="username">{{ site.github_username }}</span>
-            </a>
-          </li>
-          {% endif %}
-        </ul>
       </div>
 
       <div class="footer-col footer-col-3">

_includes/footer.nodesc.html

@@ -11,36 +11,10 @@
         </ul>
       </div>
       <div class="footer-col footer-col-2">
-        <ul class="social-media-list">
+        {%- include social.html -%}
-          {% if site.facebook_username %}
-          <li>
-            <a href="https://facebook.com/{{ site.facebook_username }}">
-              <span class="username">FB:{{ site.facebook_username }}</span>
-            </a>
-          </li>
-          {% endif %} {% if site.github_username %}
-          <li>
-            <a href="https://github.com/{{ site.github_username }}">
-              <span class="icon icon--github">
-                <svg viewBox="0 0 16 16">
-                  <path
-                    fill="#828282"
-                    d="M7.999,0.431c-4.285,0-7.76,3.474-7.76,7.761 c0,3.428,2.223,6.337,5.307,7.363c0.388,0.071,0.53-0.168,0.53-0.374c0-0.184-0.007-0.672-0.01-1.32 c-2.159,0.469-2.614-1.04-2.614-1.04c-0.353-0.896-0.862-1.135-0.862-1.135c-0.705-0.481,0.053-0.472,0.053-0.472 c0.779,0.055,1.189,0.8,1.189,0.8c0.692,1.186,1.816,0.843,2.258,0.645c0.071-0.502,0.271-0.843,0.493-1.037 C4.86,11.425,3.049,10.76,3.049,7.786c0-0.847,0.302-1.54,0.799-2.082C3.768,5.507,3.501,4.718,3.924,3.65 c0,0,0.652-0.209,2.134,0.796C6.677,4.273,7.34,4.187,8,4.184c0.659,0.003,1.323,0.089,1.943,0.261 c1.482-1.004,2.132-0.796,2.132-0.796c0.423,1.068,0.157,1.857,0.077,2.054c0.497,0.542,0.798,1.235,0.798,2.082 c0,2.981-1.814,3.637-3.543,3.829c0.279,0.24,0.527,0.713,0.527,1.437c0,1.037-0.01,1.874-0.01,2.129 c0,0.208,0.14,0.449,0.534,0.373c3.081-1.028,5.302-3.935,5.302-7.362C15.76,3.906,12.285,0.431,7.999,0.431z"
-                  />
-                </svg>
-              </span>
-
-              <span class="username">{{ site.github_username }}</span>
-            </a>
-          </li>
-          {% endif %}
-        </ul>
       </div>
 
       <div class="footer-col footer-col-3">
-        <!--
-        <p class="text">{{ site.description|markdownify }}</p>
-        -->
       </div>
     </div>
   </div>

_includes/head.html

@@ -11,7 +11,7 @@
   <link rel="openid.delegate" href="https://aminda.eu/" />
   <link rel="openid.server" href="https://openid.indieauth.com/openid" />
 
-  <link rel="stylesheet" href="{{ "/css/main.css" | prepend: site.baseurl }}">
+  <link rel="stylesheet" href="{{ "/assets/main.css" | prepend: site.baseurl }}">
   <link rel="canonical" href="{{ page.url | replace:'index.html','' | prepend: site.baseurl | prepend: site.url }}">
   <link rel="alternate" type="application/rss+xml" title="{{ site.title }}" href="{{ "/blog/feed.xml" | prepend: site.baseurl | prepend: site.url }}" />
   <link rel="alternate" type="application/rss+xml" title="{{ site.title }} - in English" href="{{ "/blog/feed.en.xml" | prepend: site.baseurl | prepend: site.url }}" />

_sass/_base.scss

@@ -1,212 +0,0 @@
-/**
- * Reset some basic elements
- */
-body,
-h1,
-h2,
-h3,
-h4,
-h5,
-h6,
-p,
-blockquote,
-pre,
-hr,
-dl,
-dd,
-ol,
-ul,
-figure {
-  margin: 0;
-  padding: 0;
-}
-
-/**
- * Basic styling
- */
-body {
-  font-family: $base-font-family;
-  font-size: $base-font-size;
-  line-height: $base-line-height;
-  font-weight: 300;
-  color: $text-color;
-  background-color: $background-color;
-  -webkit-text-size-adjust: 100%;
-}
-
-/**
- * Set `margin-bottom` to maintain vertical rhythm
- */
-h1,
-h2,
-h3,
-h4,
-h5,
-h6,
-p,
-blockquote,
-pre,
-ul,
-ol,
-dl,
-figure,
-%vertical-rhythm {
-  margin-bottom: $spacing-unit / 2;
-}
-
-/**
- * Images
- */
-img {
-  max-width: 100%;
-  vertical-align: middle;
-}
-
-/**
- * Figures
- */
-figure > img {
-  display: block;
-}
-
-figcaption {
-  font-size: $small-font-size;
-}
-
-/**
- * Lists
- */
-ul,
-ol {
-  margin-left: $spacing-unit;
-}
-
-li {
-  > ul,
-  > ol {
-    margin-bottom: 0;
-  }
-}
-
-/**
- * Headings
- */
-h1,
-h2,
-h3,
-h4,
-h5,
-h6 {
-  font-weight: 300;
-}
-
-/**
- * Links
- */
-a {
-  color: $brand-color;
-  //text-decoration: none;
-  text-decoration: underline;
-
-  &:visited {
-    color: revert;
-    //darken($brand-color, 15%);
-  }
-
-  &:hover {
-    color: $text-color;
-    text-decoration: underline;
-  }
-}
-
-/**
- * Blockquotes
- */
-blockquote {
-  color: $grey-color;
-  border-left: 4px solid $grey-color-light;
-  padding-left: $spacing-unit / 2;
-  font-size: 18px;
-  letter-spacing: -1px;
-  font-style: italic;
-
-  > :last-child {
-    margin-bottom: 0;
-  }
-}
-
-/**
- * Code formatting
- */
-pre,
-code {
-  //font-size: 15px;
-  font-size: revert;
-  font-family: $monospace-font-family;
-  border: 1px solid $grey-color-light;
-  border-radius: 3px;
-  //background-color: #eef;
-  background-color: revert;
-}
-
-code {
-  padding: 1px 5px;
-}
-
-pre {
-  padding: 8px 12px;
-  overflow-x: scroll;
-
-  > code {
-    border: 0;
-    padding-right: 0;
-    padding-left: 0;
-  }
-}
-
-/**
- * Wrapper
- */
-.wrapper {
-  max-width: -webkit-calc(#{$content-width} - (#{$spacing-unit} * 2));
-  max-width: calc(#{$content-width} - (#{$spacing-unit} * 2));
-  margin-right: auto;
-  margin-left: auto;
-  padding-right: $spacing-unit;
-  padding-left: $spacing-unit;
-  @extend %clearfix;
-
-  @include media-query($on-laptop) {
-    max-width: -webkit-calc(#{$content-width} - (#{$spacing-unit}));
-    max-width: calc(#{$content-width} - (#{$spacing-unit}));
-    padding-right: $spacing-unit / 2;
-    padding-left: $spacing-unit / 2;
-  }
-}
-
-/**
- * Clearfix
- */
-%clearfix {
-  &:after {
-    content: "";
-    display: table;
-    clear: both;
-  }
-}
-
-/**
- * Icons
- */
-.icon {
-  > svg {
-    display: inline-block;
-    width: 16px;
-    height: 16px;
-    vertical-align: middle;
-
-    path {
-      fill: $grey-color;
-    }
-  }
-}

_sass/_layout.scss

@@ -1,231 +0,0 @@
-/**
- * Site header
- */
-.site-header {
-  border-top: 5px solid $grey-color-dark;
-  border-bottom: 1px solid $grey-color-light;
-  min-height: 56px;
-
-  // Positioning context for the mobile navigation icon
-  position: relative;
-}
-
-.site-title {
-  font-size: 26px;
-  line-height: 56px;
-  letter-spacing: -1px;
-  margin-bottom: 0;
-  float: left;
-
-  &,
-  &:visited {
-    color: $grey-color-dark;
-  }
-}
-
-.site-nav {
-  float: right;
-  line-height: 56px;
-  border: 1px dashed;
-
-  .menu-icon {
-    display: none;
-  }
-
-  .page-link {
-    color: $text-color;
-    line-height: $base-line-height;
-
-    // Gaps between nav items, but not on the first one
-    &:not(:first-child) {
-      margin-left: 20px;
-    }
-  }
-
-  @include media-query($on-palm) {
-    position: absolute;
-    top: 9px;
-    right: 30px;
-    background-color: $background-color;
-    border: 1px solid $grey-color-light;
-    border-radius: 5px;
-    text-align: right;
-
-    .menu-icon {
-      display: block;
-      float: right;
-      width: 36px;
-      height: 26px;
-      line-height: 0;
-      padding-top: 10px;
-      text-align: center;
-
-      > svg {
-        width: 18px;
-        height: 15px;
-
-        path {
-          fill: $grey-color-dark;
-        }
-      }
-    }
-
-    .trigger {
-      clear: both;
-      display: none;
-    }
-
-    &:hover .trigger {
-      display: block;
-      padding-bottom: 5px;
-    }
-
-    .page-link {
-      display: block;
-      padding: 5px 10px;
-    }
-  }
-}
-
-/**
- * Site footer
- */
-.site-footer {
-  border-top: 1px solid $grey-color-light;
-  padding: $spacing-unit 0;
-}
-
-.footer-heading {
-  font-size: 18px;
-  margin-bottom: $spacing-unit / 2;
-}
-
-.contact-list,
-.social-media-list {
-  list-style: none;
-  margin-left: 0;
-}
-
-.footer-col-wrapper {
-  font-size: 15px;
-  color: $grey-color;
-  margin-left: -$spacing-unit / 2;
-  @extend %clearfix;
-}
-
-.footer-col {
-  float: left;
-  margin-bottom: $spacing-unit / 2;
-  padding-left: $spacing-unit / 2;
-}
-
-.footer-col-1 {
-  width: -webkit-calc(35% - (#{$spacing-unit} / 2));
-  width: calc(35% - (#{$spacing-unit} / 2));
-}
-
-.footer-col-2 {
-  width: -webkit-calc(20% - (#{$spacing-unit} / 2));
-  width: calc(20% - (#{$spacing-unit} / 2));
-}
-
-.footer-col-3 {
-  width: -webkit-calc(45% - (#{$spacing-unit} / 2));
-  width: calc(45% - (#{$spacing-unit} / 2));
-}
-
-@include media-query($on-laptop) {
-  .footer-col-1,
-  .footer-col-2 {
-    width: -webkit-calc(50% - (#{$spacing-unit} / 2));
-    width: calc(50% - (#{$spacing-unit} / 2));
-  }
-
-  .footer-col-3 {
-    width: -webkit-calc(100% - (#{$spacing-unit} / 2));
-    width: calc(100% - (#{$spacing-unit} / 2));
-  }
-}
-
-@include media-query($on-palm) {
-  .footer-col {
-    float: none;
-    width: -webkit-calc(100% - (#{$spacing-unit} / 2));
-    width: calc(100% - (#{$spacing-unit} / 2));
-  }
-}
-
-/**
- * Page content
- */
-.page-content {
-  padding: $spacing-unit 0;
-}
-
-.page-heading {
-  font-size: 20px;
-}
-
-.post-list {
-  margin-left: 0;
-  list-style: none;
-
-  > li {
-    margin-bottom: $spacing-unit;
-  }
-}
-
-.post-meta {
-  font-size: $small-font-size;
-  color: $grey-color;
-}
-
-.post-link {
-  display: block;
-  font-size: 24px;
-}
-
-/**
- * Posts
- */
-.post-header {
-  margin-bottom: $spacing-unit;
-}
-
-.post-title {
-  font-size: 42px;
-  letter-spacing: -1px;
-  line-height: 1;
-
-  @include media-query($on-laptop) {
-    font-size: 36px;
-  }
-}
-
-.post-content {
-  margin-bottom: $spacing-unit;
-
-  h2 {
-    font-size: 32px;
-
-    @include media-query($on-laptop) {
-      font-size: 28px;
-    }
-  }
-
-  h3 {
-    font-size: 26px;
-
-    @include media-query($on-laptop) {
-      font-size: 22px;
-    }
-  }
-
-  h4 {
-    font-size: 20px;
-
-    @include media-query($on-laptop) {
-      font-size: 18px;
-    }
-  }
-}

_sass/_syntax-highlighting.scss

@@ -1,200 +0,0 @@
-/**
- * Syntax highlighting styles
- */
-.highlight {
-  //background: #fff;
-  @extend %vertical-rhythm;
-
-  .c {
-    color: #998;
-    font-style: italic;
-  } // Comment
-  .err {
-    color: #a61717;
-    background-color: #e3d2d2;
-  } // Error
-  .k {
-    font-weight: bold;
-  } // Keyword
-  .o {
-    font-weight: bold;
-  } // Operator
-  .cm {
-    color: #998;
-    font-style: italic;
-  } // Comment.Multiline
-  .cp {
-    color: #999;
-    font-weight: bold;
-  } // Comment.Preproc
-  .c1 {
-    color: #998;
-    font-style: italic;
-  } // Comment.Single
-  .cs {
-    color: #999;
-    font-weight: bold;
-    font-style: italic;
-  } // Comment.Special
-  .gd {
-    color: #000;
-    background-color: #fdd;
-  } // Generic.Deleted
-  .gd .x {
-    color: #000;
-    background-color: #faa;
-  } // Generic.Deleted.Specific
-  .ge {
-    font-style: italic;
-  } // Generic.Emph
-  .gr {
-    color: #a00;
-  } // Generic.Error
-  .gh {
-    color: #999;
-  } // Generic.Heading
-  .gi {
-    color: #000;
-    background-color: #dfd;
-  } // Generic.Inserted
-  .gi .x {
-    color: #000;
-    background-color: #afa;
-  } // Generic.Inserted.Specific
-  .go {
-    color: #888;
-  } // Generic.Output
-  .gp {
-    color: #555;
-  } // Generic.Prompt
-  .gs {
-    font-weight: bold;
-  } // Generic.Strong
-  .gu {
-    color: #aaa;
-  } // Generic.Subheading
-  .gt {
-    color: #a00;
-  } // Generic.Traceback
-  .kc {
-    font-weight: bold;
-  } // Keyword.Constant
-  .kd {
-    font-weight: bold;
-  } // Keyword.Declaration
-  .kp {
-    font-weight: bold;
-  } // Keyword.Pseudo
-  .kr {
-    font-weight: bold;
-  } // Keyword.Reserved
-  .kt {
-    color: #458;
-    font-weight: bold;
-  } // Keyword.Type
-  .m {
-    color: #099;
-  } // Literal.Number
-  .s {
-    color: #d14;
-  } // Literal.String
-  .na {
-    color: #008080;
-  } // Name.Attribute
-  .nb {
-    color: #0086b3;
-  } // Name.Builtin
-  .nc {
-    color: #458;
-    font-weight: bold;
-  } // Name.Class
-  .no {
-    color: #008080;
-  } // Name.Constant
-  .ni {
-    color: #800080;
-  } // Name.Entity
-  .ne {
-    color: #900;
-    font-weight: bold;
-  } // Name.Exception
-  .nf {
-    color: #900;
-    font-weight: bold;
-  } // Name.Function
-  .nn {
-    color: #555;
-  } // Name.Namespace
-  .nt {
-    color: #000080;
-  } // Name.Tag
-  .nv {
-    color: #008080;
-  } // Name.Variable
-  .ow {
-    font-weight: bold;
-  } // Operator.Word
-  .w {
-    color: #bbb;
-  } // Text.Whitespace
-  .mf {
-    color: #099;
-  } // Literal.Number.Float
-  .mh {
-    color: #099;
-  } // Literal.Number.Hex
-  .mi {
-    color: #099;
-  } // Literal.Number.Integer
-  .mo {
-    color: #099;
-  } // Literal.Number.Oct
-  .sb {
-    color: #d14;
-  } // Literal.String.Backtick
-  .sc {
-    color: #d14;
-  } // Literal.String.Char
-  .sd {
-    color: #d14;
-  } // Literal.String.Doc
-  .s2 {
-    color: #d14;
-  } // Literal.String.Double
-  .se {
-    color: #d14;
-  } // Literal.String.Escape
-  .sh {
-    color: #d14;
-  } // Literal.String.Heredoc
-  .si {
-    color: #d14;
-  } // Literal.String.Interpol
-  .sx {
-    color: #d14;
-  } // Literal.String.Other
-  .sr {
-    color: #009926;
-  } // Literal.String.Regex
-  .s1 {
-    color: #d14;
-  } // Literal.String.Single
-  .ss {
-    color: #990073;
-  } // Literal.String.Symbol
-  .bp {
-    color: #999;
-  } // Name.Builtin.Pseudo
-  .vc {
-    color: #008080;
-  } // Name.Variable.Class
-  .vg {
-    color: #008080;
-  } // Name.Variable.Global
-  .vi {
-    color: #008080;
-  } // Name.Variable.Instance
-  .il {
-    color: #099;
-  } // Literal.Number.Integer.Long
-}

assets/main.scss

@@ -8,52 +8,30 @@
 $base-font-family: "Liberation Serif", "Tinos", "Times New Roman", serif;
 $monospace-font-family: "Liberation Mono", "Cousine", "Courier New", monospace;
 //$base-font-family: "Liberation Sans", "Arimo", "Arial", sans-serif;
-//$base-font-size: 16px;
-$base-font-size: revert;
-//$small-font-size: $base-font-size * 0.875;
-$small-font-size: revert;
-$base-line-height: 1.5;
 
-$spacing-unit: 30px;
+@import "{{ site.theme }}";
-
-$text-color: revert;
-//#111;
-$background-color: revert;
-//#fdfdfd;
-$brand-color: revert;
-//#2a7ae2;
-
-$grey-color: revert;
-//#828282;
-$grey-color-light: revert;
-//lighten($grey-color, 40%);
-$grey-color-dark: revert;
-//darken($grey-color, 25%);
-
-// Width of the content area
-$content-width: 800px;
-
-$on-palm: 600px;
-$on-laptop: 800px;
-
-// Using media queries with like this:
-// @include media-query($on-palm) {
-//     .wrapper {
-//         padding-right: $spacing-unit / 2;
-//         padding-left: $spacing-unit / 2;
-//     }
-// }
-@mixin media-query($device) {
-  @media screen and (max-width: $device) {
-    @content;
-  }
-}
 
 // As high in css as can be edited. If I understand correctly, user
 // preference will take priority over this, but if the user hasn't expressed
 // it, this will make dark default.
 :root {
-  color-scheme: dark light;
+  color-scheme: dark light !important;
+}
+
+// Revert to defaults
+* {
+  color: revert !important;
+  text-color: revert !important;
+  background-color: revert !important;
+}
+
+// Fitting to text and monospace preferred
+code {
+  font-size: 0.8em !important;
+}
+code,
+pre {
+  font-family: $monospace-font-family !important;
 }
 
 // Overrides for dark themes
@@ -88,9 +66,6 @@ $on-laptop: 800px;
   }
 }
 
-// Import partials from `sass_dir` (defaults to `_sass`)
-@import "base", "layout", "syntax-highlighting";
-
 // This is used in the index
 #avatar {
   margin-left: auto;
@@ -140,8 +115,3 @@ img {
   border: 1px solid;
   //black;
 }
-
-// Also in index, hidden text
-//#cake {
-//  color: rgba(0, 0, 0, 0);
-//}