Minify HTML & CSS (#1351)

privacyguides · May 28, 2022 · 26acb80 · 26acb80
1 parent 072e087
commit 26acb80
Show file tree

Hide file tree

Showing 11 changed files with 48 additions and 14 deletions.
diff --git a/Pipfile b/Pipfile
@@ -9,6 +9,7 @@ mkdocs-material = {path = "./mkdocs-material"}
 mkdocs-static-i18n = "*"
 mkdocs-git-revision-date-localized-plugin = "*"
 typing-extensions = "*"
+mkdocs-minify-plugin = "*"
 
 [dev-packages]
 scour = "*"

diff --git a/Pipfile.lock b/Pipfile.lock
diff --git a/README.md b/README.md
@@ -74,7 +74,7 @@ This website uses [`mkdocs-material-insiders`](https://squidfunk.github.io/mkdoc
     - `git submodule init`
     - `git submodule update docs/assets/brand`
 2. Install [Python 3.6+](https://www.python.org/downloads/)
-3. Install [dependencies](/Pipfile): `pip install mkdocs mkdocs-material mkdocs-static-i18n mkdocs-git-revision-date-localized-plugin typing-extensions`
+3. Install [dependencies](/Pipfile): `pip install mkdocs mkdocs-material mkdocs-static-i18n mkdocs-git-revision-date-localized-plugin mkdocs-minify-plugin typing-extensions`
 4. Serve the site locally: `mkdocs serve`
     - The site will be available at `http://localhost:8000`
     - You can build the site locally with `mkdocs build`

diff --git a/docs/javascripts/LICENSE.mathjax.txt → docs/assets/javascripts/LICENSE.mathjax.txt b/docs/javascripts/LICENSE.mathjax.txt → docs/assets/javascripts/LICENSE.mathjax.txt
diff --git a/docs/javascripts/feedback.js → docs/assets/javascripts/feedback.js b/docs/javascripts/feedback.js → docs/assets/javascripts/feedback.js
diff --git a/docs/javascripts/mathjax.js → docs/assets/javascripts/mathjax.js b/docs/javascripts/mathjax.js → docs/assets/javascripts/mathjax.js
diff --git a/...l/fonts/woff-v2/MathJax_Main-Regular.woff → ...l/fonts/woff-v2/MathJax_Main-Regular.woff b/...l/fonts/woff-v2/MathJax_Main-Regular.woff → ...l/fonts/woff-v2/MathJax_Main-Regular.woff
diff --git a/...put/chtml/fonts/woff-v2/MathJax_Zero.woff → ...put/chtml/fonts/woff-v2/MathJax_Zero.woff b/...put/chtml/fonts/woff-v2/MathJax_Zero.woff → ...put/chtml/fonts/woff-v2/MathJax_Zero.woff
diff --git a/theme/overrides/home.css → docs/assets/stylesheets/home.css b/theme/overrides/home.css → docs/assets/stylesheets/home.css
diff --git a/mkdocs.yml b/mkdocs.yml
@@ -77,6 +77,13 @@ watch:
   - includes
 
 plugins:
+  - minify:
+      minify_html: true
+      htmlmin_opts:
+          remove_comments: true
+      minify_css: true
+      css_files:
+          - assets/stylesheets/extra.css
   - i18n:
       default_language: en
       material_alternate: true
@@ -133,8 +140,8 @@ markdown_extensions:
       toc_depth: 4
 
 extra_javascript:
-  - javascripts/mathjax.js
-  - javascripts/feedback.js
+  - assets/javascripts/mathjax.js
+  - assets/javascripts/feedback.js
 
 nav:
   - Home: 'index.md'

diff --git a/theme/overrides/home.en.html b/theme/overrides/home.en.html
@@ -1,6 +1,6 @@
 {% extends "base.html" %}
 {% block extrahead %}
-  <link rel="stylesheet" href="{{ 'overrides/home.css' | url }}">
+  <link rel="stylesheet" href="{{ 'assets/stylesheets/home.css' | url }}">
   <link rel="me" href="https://aragon.sh/@jonah">
   <link rel="me" href="https://fosstodon.org/@freddy">
   <link rel="me" href="https://mastodon.social/@dngray">