From 2fbeb28d9dbda3e27fbe78dfa7cd53e76db8dab2 Mon Sep 17 00:00:00 2001
From: squidfunk <martin.donath@squidfunk.com>
Date: Sun, 10 Jun 2018 13:52:51 +0200
Subject: [PATCH] Packaged Material icons with theme (GDPR)

---
 material/base.html | 2 +-
 package-lock.json  | 8 +++++++-
 src/base.html      | 8 ++++----
 webpack.config.js  | 6 ++++++
 4 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/material/base.html b/material/base.html
index 7a236fc3b..833ea9764 100644
--- a/material/base.html
+++ b/material/base.html
@@ -65,8 +65,8 @@
             }}">
         <style>body,input{font-family:"{{ font.text }}","Helvetica Neue",Helvetica,Arial,sans-serif}code,kbd,pre{font-family:"{{ font.code }}","Courier New",Courier,monospace}</style>
       {% endif %}
-      <link rel="stylesheet" href="https://fonts.googleapis.com/icon?family=Material+Icons">
     {% endblock %}
+    <link rel="stylesheet" href="{{ base_url }}/assets/fonts/material-icons.css">
     {% for path in extra_css %}
       <link rel="stylesheet" href="{{ path }}">
     {% endfor %}
diff --git a/package-lock.json b/package-lock.json
index be51b8d00..7fd8c146b 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "mkdocs-material",
-  "version": "2.7.1",
+  "version": "2.7.3",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
@@ -7337,6 +7337,12 @@
       "integrity": "sha1-6K+VjYUqh0e/shHkjOEoK9qRiBU=",
       "dev": true
     },
+    "material-design-icons": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/material-design-icons/-/material-design-icons-3.0.1.tgz",
+      "integrity": "sha1-mnHEh0chjrylHlGmbaaCA4zct78=",
+      "dev": true
+    },
     "material-shadows": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/material-shadows/-/material-shadows-3.0.1.tgz",
diff --git a/src/base.html b/src/base.html
index bb9132ca7..52287c15d 100644
--- a/src/base.html
+++ b/src/base.html
@@ -135,12 +135,12 @@
           }
         </style>
       {% endif %}
-
-      <!-- Material icons as a default iconset -->
-      <link rel="stylesheet" type="text/css"
-          href="https://fonts.googleapis.com/icon?family=Material+Icons" />
     {% endblock %}
 
+    <!-- Material icons as iconset -->
+    <link rel="stylesheet" type="text/css"
+        href="{{ base_url }}/assets/fonts/material-icons.css" />
+
     <!-- Custom stylesheets -->
     {% for path in extra_css %}
       <link rel="stylesheet" type="text/css" href="{{ path }}" />
diff --git a/webpack.config.js b/webpack.config.js
index b2fe463e0..5182dad13 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -122,6 +122,12 @@ module.exports = env => {
           }
         },
 
+        /* Copy web fonts */
+        {
+          context: "src",
+          from: "assets/fonts/**/*"
+        },
+
         /* Copy images without cache busting */
         {
           context: "src",