Enable new mkdocs-material features (#2451)

config/mkdocs-common.yml

@@ -30,7 +30,7 @@ site_description:
   ]
 copyright:
   !ENV [FOOTER_COPYRIGHT, "© 2019 Privacy Guides and contributors."]
-edit_uri: edit/main/docs/
+edit_uri_template: blob/main/docs/{path}?plain=1
 
 extra:
   generator: false
@@ -152,6 +152,11 @@ theme:
     - navigation.expand
     - navigation.path
     - navigation.indexes
+    - navigation.instant
+    - navigation.instant.prefetch
+    - navigation.instant.progress
+    - navigation.instant.preview
+    - content.action.edit
     - content.tabs.link
     - content.tooltips
     - search.highlight

config/mkdocs.es.yml

@@ -23,7 +23,7 @@ docs_dir: "../i18n/es"
 site_url: "https://www.privacyguides.org/es/"
 site_dir: "../site/es"
 
-edit_uri: edit/main/i18n/es/
+edit_uri_template: https://github.com/privacyguides/i18n/blob/main/i18n/es/{path}?plain=1
 
 theme:
   language: es

config/mkdocs.fr.yml

@@ -23,7 +23,7 @@ docs_dir: "../i18n/fr"
 site_url: "https://www.privacyguides.org/fr/"
 site_dir: "../site/fr"
 
-edit_uri: edit/main/i18n/fr/
+edit_uri_template: https://github.com/privacyguides/i18n/blob/main/i18n/fr/{path}?plain=1
 
 theme:
   language: fr

config/mkdocs.he.yml

@@ -23,7 +23,7 @@ docs_dir: "../i18n/he"
 site_url: "https://www.privacyguides.org/he/"
 site_dir: "../site/he"
 
-edit_uri: edit/main/i18n/he/
+edit_uri_template: https://github.com/privacyguides/i18n/blob/main/i18n/he/{path}?plain=1
 
 extra_css:
   - assets/stylesheets/extra.css?v=3.2.0

config/mkdocs.it.yml

@@ -23,7 +23,7 @@ docs_dir: "../i18n/it"
 site_url: "https://www.privacyguides.org/it/"
 site_dir: "../site/it"
 
-edit_uri: edit/main/i18n/it/
+edit_uri_template: https://github.com/privacyguides/i18n/blob/main/i18n/it/{path}?plain=1
 
 theme:
   language: it

config/mkdocs.nl.yml

@@ -23,7 +23,7 @@ docs_dir: "../i18n/nl"
 site_url: "https://www.privacyguides.org/nl/"
 site_dir: "../site/nl"
 
-edit_uri: edit/main/i18n/nl/
+edit_uri_template: https://github.com/privacyguides/i18n/blob/main/i18n/nl/{path}?plain=1
 
 theme:
   language: nl

config/mkdocs.ru.yml

@@ -23,7 +23,7 @@ docs_dir: "../i18n/ru"
 site_url: "https://www.privacyguides.org/ru/"
 site_dir: "../site/ru"
 
-edit_uri: edit/main/docs/
+edit_uri_template: https://github.com/privacyguides/i18n/blob/main/i18n/ru/{path}?plain=1
 
 extra_css:
   - assets/stylesheets/extra.css?v=3.2.0

config/mkdocs.zh-Hant.yml

@@ -23,7 +23,7 @@ docs_dir: "../i18n/zh-Hant"
 site_url: "https://www.privacyguides.org/zh-Hant/"
 site_dir: "../site/zh-Hant"
 
-edit_uri: edit/main/i18n/zh-Hant/
+edit_uri_template: https://github.com/privacyguides/i18n/blob/main/i18n/zh-Hant/{path}?plain=1
 
 extra_css:
   - assets/stylesheets/extra.css?v=3.2.0

netlify.toml

@@ -35,19 +35,9 @@
     X-XSS-Protection = "0"
     X-Content-Type-Options = "nosniff"
     Strict-Transport-Security = "max-age=63072000; includeSubDomains; preload"
-    Content-Security-Policy = "default-src 'none'; script-src https://www.privacyguides.org 'self' 'unsafe-inline'; style-src 'self' 'unsafe-inline'; font-src 'self' data:; img-src data: 'self'; connect-src https://api.github.com https://*.privacyguides.net 'self'; frame-src https://*.privacyguides.net; frame-ancestors 'none'"
+    Content-Security-Policy = "default-src 'none'; script-src https://www.privacyguides.org 'self' 'unsafe-inline'; style-src 'self' 'unsafe-inline'; font-src 'self' data:; img-src data: 'self'; connect-src https://api.github.com https://*.privacyguides.net https://www.privacyguides.org 'self'; frame-src https://*.privacyguides.net https://snowflake.torproject.org; frame-ancestors 'none'"
     Permissions-Policy = "browsing-topics=(), conversion-measurement=(), interest-cohort=(), accelerometer=(), ambient-light-sensor=(), battery=(), camera=(), display-capture=(), geolocation=(), gyroscope=(), magnetometer=(), microphone=(), usb=()"
 
-[[headers]]
-  for = "/:lang/about/donate/"
-  [headers.values]
-    Content-Security-Policy = "default-src 'none'; script-src https://opencollective.com https://www.privacyguides.org 'self' 'unsafe-inline'; style-src 'self' 'unsafe-inline'; font-src 'self' data:; img-src https://opencollective.com data: 'self'; connect-src https://api.github.com https://*.privacyguides.net 'self'; frame-src https://opencollective.com; frame-ancestors 'none'"
-
-[[headers]]
-  for = "/:lang/tor/"
-  [headers.values]
-    Content-Security-Policy = "default-src 'none'; script-src https://www.privacyguides.org 'self' 'unsafe-inline'; style-src 'self' 'unsafe-inline'; font-src 'self' data:; img-src data: 'self'; connect-src https://api.github.com https://*.privacyguides.net 'self'; frame-src https://snowflake.torproject.org; frame-ancestors 'none'"
-
 [[redirects]]
     from = "/es/*"
     to = "/i18n/404.es.html"

theme/main.html

@@ -69,24 +69,7 @@
     <title>{{ config.site_name }}</title>
     {% endif %}
 {% endblock %}
-{% block announce %}{% if config.extra.offline %}
-    You're viewing an offline copy of Privacy Guides built on {{ build_date_utc }}.
-    <a href="https://www.privacyguides.org/">
-    <strong>Visit privacyguides.org for the latest version.</strong>
-    </a>
-{% elif config.extra.context == "deploy-preview" %}
-    You're viewing an <strong>unreviewed preview</strong> of Privacy Guides built on {{ build_date_utc }}.
-    These previews are <strong>user-submitted</strong> and may not necessarily reflect the opinion of the site.
-    <a href="https://www.privacyguides.org/">
-    <strong>Visit privacyguides.org for current advice.</strong>
-    </a>
-{% elif config.extra.context == "branch-deploy" %}
-    You're viewing a <strong>staging branch</strong> of Privacy Guides built on {{ build_date_utc }}.
-    The information on this page may be incomplete or otherwise not yet meet our editorial release standards.
-    <a href="https://www.privacyguides.org/">
-    <strong>Visit privacyguides.org for current advice.</strong>
-    </a>
-{% else %}{% endif %}{% endblock %}
+
 {% block extrahead %}
 <meta name="robots" content="max-snippet:-1, max-image-preview:large">
 {% if config.extra.context == "production" %}
@@ -102,8 +85,8 @@
 {% block content %}
     {% if page and page.meta and page.meta.cover %}
     <div class="center-cropped" style="background-image:linear-gradient(rgba(0, 0, 0, 0.6), rgba(0, 0, 0, 0.6)), url('/en/assets/img/cover/{{ page.meta.cover }}');">
-        <h1>{{ page.title | d(config.site_name, true)}}</h1>
         <img src="/en/assets/img/cover/{{ page.meta.cover }}" alt="">
+        <h1>{{ page.title | d(config.site_name, true)}}</h1>
     </div>
     {% endif %}
     {% if "material/tags" in config.plugins %}

theme/partials/header.html

@@ -21,6 +21,35 @@
   IN THE SOFTWARE.
 -->
 
+{% macro notice() %}{% if config.extra.offline %}
+    You're viewing an offline copy of Privacy Guides built on {{ build_date_utc.strftime('%B %d, %Y at %I:%M%p') }}.
+    <a href="https://www.privacyguides.org/">
+    <strong>Visit privacyguides.org for the latest version.</strong>
+    </a>
+{% elif config.extra.context == "deploy-preview" %}
+    You're viewing an <strong>unreviewed preview</strong> of Privacy Guides built on {{ build_date_utc.strftime('%B %d, %Y at %I:%M%p') }}.
+    These previews are <strong>user-submitted</strong> and may not necessarily reflect the opinion of the site.
+    <a href="https://www.privacyguides.org/">
+    <strong>Visit privacyguides.org for current advice.</strong>
+    </a>
+{% elif config.extra.context == "branch-deploy" %}
+    You're viewing a <strong>staging branch</strong> of Privacy Guides built on {{ build_date_utc.strftime('%B %d, %Y at %I:%M%p') }}.
+    The information on this page may be incomplete or otherwise not yet meet our editorial release standards.
+    <a href="https://www.privacyguides.org/">
+    <strong>Visit privacyguides.org for current advice.</strong>
+    </a>
+{% else %}{% endif %}{% endmacro %}
+
+{% if notice() %}
+<div data-md-color-scheme="default" data-md-component="outdated">
+  <aside class="md-banner md-banner--warning">
+    <div class="md-banner__inner md-grid md-typeset">
+      {{ notice() }}
+    </div>
+  </aside>
+</div>
+{% endif %}
+
 <!-- Determine classes -->
 {% set class = "md-header" %}
 {% if "navigation.tabs.sticky" in features %}