Merge upstream

2022-10-10 12:47:38 -04:00
parent f4ebff5cda
commit fd4e05cc7d
80 changed files with 1685 additions and 3017 deletions
--- a/blog.bryanroessler.com/_layouts/minimal.html
+++ b/blog.bryanroessler.com/_layouts/minimal.html
@@ -1,12 +1,12 @@
 ---
 common-css:
-  - "/assets/css/main-minimal.css"
+  - "/assets/css/beautifuljekyll-minimal.css"
 common-ext-css:
  - href: "https://stackpath.bootstrapcdn.com/bootstrap/4.4.1/css/bootstrap.min.css"
    sri: "sha384-Vkoo8x4CGsO3+Hhxv8T/Q5PaXtkKtu6ug5TOeNV6gBiFeWPGFN9MuhOf23Q9Ifjh"
 common-ext-js:
-  - href: "https://code.jquery.com/jquery-3.4.1.min.js"
-    sri: "sha256-CSXorXvZcTkaix6Yvo6HppcZGetbYMGWSFlBw8HfCJo="
+  - href: "https://code.jquery.com/jquery-3.5.1.slim.min.js"
+    sri: "sha256-4+XzXVhsDmqanXGHaHvgh1gMQKX40OUvDEBTu8JcmNs="
  - href: "https://cdn.jsdelivr.net/npm/popper.js@1.16.0/dist/umd/popper.min.js"
    sri: "sha384-Q6E9RHvbIyZFJoft+2mJbHaEWldlvI9IOYy5n3zV9zzTtmI3UksdQRVvoxMfooAo"
  - href: "https://stackpath.bootstrapcdn.com/bootstrap/4.4.1/js/bootstrap.min.js"
@@ -20,8 +20,24 @@ common-ext-js:

  <body>

-    <div role="main" class="container-md main-content">
+    <div role="main" class="{% if page.full-width %} container-fluid {% else %} container-md {% endif %} main-content">
+      {% if page.before-content %}
+        <div class="before-content">
+          {% for file in page.before-content %}
+            {% include {{ file }} %}
+          {% endfor %}
+        </div>
+      {% endif %}
+
      {{ content }}
+
+      {% if page.after-content %}
+        <div class="after-content">
+          {% for file in page.after-content %}
+            {% include {{ file }} %}
+          {% endfor %}
+        </div>
+      {% endif %}
    </div>

    {% include footer-minimal.html %}