Merged features tied to Scotch Bonnet funding goal

Author: squidfunk

Dockerfile

@@ -43,12 +43,17 @@ RUN \
   apk upgrade --update-cache -a \
 && \
   apk add --no-cache \
+    cairo \
+    freetype-dev \
     git \
     git-fast-import \
+    jpeg-dev \
     openssh \
+    zlib-dev \
 && \
   apk add --no-cache --virtual .build \
     gcc \
+    libffi-dev \
     musl-dev \
 && \
   pip install --no-cache-dir . \

material/assets/javascripts/bundle.2ab50757.min.js

@@ -34,7 +34,7 @@
       {% endif %}
     {% endblock %}
     {% block styles %}
-      <link rel="stylesheet" href="{{ 'assets/stylesheets/main.6b80c2a2.min.css' | url }}">
+      <link rel="stylesheet" href="{{ 'assets/stylesheets/main.bd774711.min.css' | url }}">
       {% if config.theme.palette %}
         {% set palette = config.theme.palette %}
         <link rel="stylesheet" href="{{ 'assets/stylesheets/palette.cbb835fc.min.css' | url }}">
@@ -61,13 +61,18 @@
         <style>:root{--md-text-font:"{{ text }}";--md-code-font:"{{ code }}"}</style>
       {% endif %}
     {% endblock %}
-    {% for path in config["extra_css"] %}
+    {% for path in config.extra_css %}
       <link rel="stylesheet" href="{{ path | url }}">
     {% endfor %}
     {% include "partials/javascripts/base.html" %}
     {% block analytics %}
       {% include "partials/integrations/analytics.html" %}
     {% endblock %}
+    {% if page.meta and page.meta.meta %}
+      {% for tag in page.meta.meta %}
+        <meta {% for key, value in tag.items() %} {{ key }}="{{value}}" {% endfor %}>
+      {% endfor %}
+    {% endif %}
     {% block extrahead %}{% endblock %}
   </head>
   {% set direction = config.theme.direction or lang.t('direction') %}
@@ -167,14 +172,16 @@
               </div>
             {% endif %}
           {% endblock %}
-          <div class="md-content" data-md-component="content">
-            <article class="md-content__inner md-typeset">
-              {% block content %}
-                {% include "partials/content.html" %}
-              {% endblock %}
-            </article>
-            {% include "partials/javascripts/content.html" %}
-          </div>
+          {% block container %}
+            <div class="md-content" data-md-component="content">
+              <article class="md-content__inner md-typeset">
+                {% block content %}
+                  {% include "partials/content.html" %}
+                {% endblock %}
+              </article>
+            </div>
+          {% endblock %}
+          {% include "partials/javascripts/content.html" %}
         </div>
         {% if "navigation.top" in features %}
           <a href="#" class="md-top md-icon" data-md-component="top" hidden>
@@ -211,6 +218,9 @@
       {%- if config.extra.version -%}
         {%- set _ = app.update({ "version": config.extra.version }) -%}
       {%- endif -%}
+      {%- if config.extra.tags -%}
+        {%- set _ = app.update({ "tags": config.extra.tags }) -%}
+      {%- endif -%}
       {%- set translations = app.translations -%}
       {%- for key in [
         "clipboard.copy",
@@ -235,8 +245,8 @@
       </script>
     {% endblock %}
     {% block scripts %}
-      <script src="{{ 'assets/javascripts/bundle.2ab50757.min.js' | url }}"></script>
-      {% for path in config["extra_javascript"] %}
+      <script src="{{ 'assets/javascripts/bundle.e93b4713.min.js' | url }}"></script>
+      {% for path in config.extra_javascript %}
         <script src="{{ path | url }}"></script>
       {% endfor %}
     {% endblock %}

material/assets/javascripts/bundle.e93b4713.min.js

@@ -19,5 +19,5 @@
 {% endblock %}
 {% block scripts %}
   {{ super() }}
-  <script src="{{ 'overrides/assets/javascripts/bundle.a163e2c4.min.js' | url }}"></script>
+  <script src="{{ 'overrides/assets/javascripts/bundle.a3d871f9.min.js' | url }}"></script>
 {% endblock %}

material/assets/javascripts/bundle.2ab50757.min.js.map renamed to material/assets/javascripts/bundle.e93b4713.min.js.map

@@ -1,7 +1,6 @@
 {#-
   This file was automatically generated - do not edit
 -#}
-{% import "partials/language.html" as lang with context %}
 {% set cookies = config.extra.consent.cookies %}
 {% if config.extra.analytics and not cookies %}
   {% set cookies = { "analytics": "Google Analytics" } %}

material/assets/stylesheets/main.6b80c2a2.min.css

@@ -4,7 +4,7 @@
 {% if config.extra.analytics %}
   {% set feedback = config.extra.analytics.feedback %}
 {% endif %}
-{% if page and page.meta and page.meta.hide %}
+{% if page.meta and page.meta.hide %}
   {% if "feedback" in page.meta.hide %}
     {% set feedback = None %}
   {% endif %}
@@ -27,7 +27,7 @@
           {% for rating in feedback.ratings %}
             <div data-md-value="{{ rating.data }}" hidden>
               {% set url = "/" ~ page.url %}
-              {% if page and page.meta and page.meta.title %}
+              {% if page.meta and page.meta.title %}
                 {% set title = page.meta.title | urlencode %}
               {% else %}
                 {% set title = page.title | urlencode %}

material/assets/stylesheets/main.6b80c2a2.min.css.map

@@ -66,7 +66,7 @@
         </div>
       </div>
     {% endif %}
-    {% if "search" in config["plugins"] %}
+    {% if "search" in config.plugins %}
       <label class="md-header__button md-icon" for="__search">
         {% include ".icons/material/magnify.svg" %}
       </label>

material/assets/stylesheets/main.bd774711.min.css

@@ -15,3 +15,22 @@
   {% set _ = style.append("}\x3c/style\x3e") %}
   {{ style | join }}
 {% endif %}
+{% if config.theme.icon.tag %}
+  {% set style = ["\x3cstyle\x3e"] %}
+  {% for type, icon in config.theme.icon.tag.items() %}
+    {% import ".icons/" ~ icon ~ ".svg" as icon %}
+    {% if type != "default" %}
+      {% set modifier = "--" ~ type %}
+    {% endif %}
+    {% set _ = style.append(
+      ".md-tag-icon" ~ modifier ~ "{" ~
+        "--md-tag-icon:" ~
+        "url('data:image/svg+xml;charset=utf-8," ~
+          icon | replace("\n", "") ~
+        "');" ~
+      "}"
+    ) %}
+  {% endfor %}
+  {% set _ = style.append("\x3c/style\x3e") %}
+  {{ style | join }}
+{% endif %}

material/assets/stylesheets/main.bd774711.min.css.map

@@ -12,8 +12,11 @@
   "edit.link.title": "Seite editieren",
   "footer.previous": "Zurück",
   "footer.next": "Weiter",
+  "footer.title": "Fußzeile",
+  "header.title": "Kopfzeile",
   "meta.comments": "Kommentare",
   "meta.source": "Quellcode",
+  "nav.title": "Navigation",
   "search.config.lang": "de",
   "search.placeholder": "Suche",
   "search.share": "Teilen",
@@ -30,9 +33,10 @@
   "select.language.title": "Sprache wechseln",
   "select.version.title": "Version auswählen",
   "skip.link.title": "Zum Inhalt",
-  "source.link.title": "Quellcode",
+  "source.link.title": "Zum Repository",
   "source.file.date.updated": "Letztes Update",
   "source.file.date.created": "Erstellt",
+  "tabs.title": "Hauptnavigation",
   "toc.title": "Inhaltsverzeichnis",
   "top.title": "Zurück zum Seitenanfang"
 }[key] }}{% endmacro %}

material/base.html

@@ -12,11 +12,11 @@
       </label>
       <nav class="md-search__options" aria-label="{{ lang.t('search.title') }}">
         {% if "search.share" in features %}
-          <a href="javascript:void(0)" class="md-search__icon md-icon" aria-label="{{ lang.t('search.share') }}" data-clipboard data-clipboard-text="" data-md-component="search-share" tabindex="-1">
+          <a href="javascript:void(0)" class="md-search__icon md-icon" title="{{ lang.t('search.share') }}" aria-label="{{ lang.t('search.share') }}" data-clipboard data-clipboard-text="" data-md-component="search-share" tabindex="-1">
             {% include ".icons/material/share-variant.svg" %}
           </a>
         {% endif %}
-        <button type="reset" class="md-search__icon md-icon" aria-label="{{ lang.t('search.reset') }}" tabindex="-1">
+        <button type="reset" class="md-search__icon md-icon" title="{{ lang.t('search.reset') }}" aria-label="{{ lang.t('search.reset') }}" tabindex="-1">
           {% include ".icons/material/close.svg" %}
         </button>
       </nav>

material/overrides/assets/javascripts/bundle.a163e2c4.min.js renamed to material/overrides/assets/javascripts/bundle.a3d871f9.min.js

@@ -7,12 +7,20 @@
 {% if tags %}
   <nav class="md-tags" {{ hidden }}>
     {% for tag in tags %}
+      {% if config.extra.tags %}
+        {% set icon = " md-tag-icon" %}
+        {% if tag.type %}
+          {% set icon = icon ~ " md-tag-icon--" ~ tag.type %}
+        {% endif %}
+      {% endif %}
       {% if tag.url %}
-        <a href="{{ tag.url | url }}" class="md-tag">
-          {{ tag.name }}
+        <a href="{{ tag.url | url }}" class="md-tag{{ icon }}">
+          {{- tag.name -}}
         </a>
       {% else %}
-        <span class="md-tag">{{ tag.name }}</span>
+        <span class="md-tag{{ icon }}">
+          {{- tag.name -}}
+        </span>
       {% endif %}
     {% endfor %}
   </nav>