Merge pull request #60 from mike-goodwin/development

remove remote content loading
mike-goodwin · Jul 13, 2019 · ad60026 · ad60026
2 parents fc665a9 + b45d2e9
commit ad60026
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 2 deletions.
diff --git a/content/bootstrap-theme.css b/content/bootstrap-theme.css
@@ -1,4 +1,3 @@
-@import url("https://fonts.googleapis.com/css?family=Ubuntu:400,700");
 /*!
  * bootswatch v3.3.7
  * Homepage: http://bootswatch.com

diff --git a/content/ubuntu.css b/content/ubuntu.css
@@ -0,0 +1,16 @@
+/* regular */
+@font-face {
+  font-family: 'Ubuntu';
+  font-style: normal;
+  font-weight: 400;
+  src: local('Ubuntu Regular'), local('Ubuntu-Regular'), url(../fonts/4iCs6KVjbNBYlgoKfw72.woff2) format('woff2');
+  unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
+}
+/* bold */
+@font-face {
+  font-family: 'Ubuntu';
+  font-style: normal;
+  font-weight: 700;
+  src: local('Ubuntu Bold'), local('Ubuntu-Bold'), url(../fonts/4iCv6KVjbNBYlgoCxCvjsGyN.woff2) format('woff2');
+  unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
+}
diff --git a/fonts/4iCs6KVjbNBYlgoKfw72.woff2 b/fonts/4iCs6KVjbNBYlgoKfw72.woff2
diff --git a/fonts/4iCv6KVjbNBYlgoCxCvjsGyN.woff2 b/fonts/4iCv6KVjbNBYlgoCxCvjsGyN.woff2
diff --git a/index.html b/index.html
@@ -5,9 +5,10 @@
     <meta charset="utf-8" />
     <meta http-equiv="X-UA-Compatible" content="IE=edge, chrome=1" />
     <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, minimum-scale=1, user-scalable=no" />
-    <meta http-equiv="Content-Security-Policy" content="default-src 'none'; script-src 'self'; connect-src 'self' https://raw.githubusercontent.com/mike-goodwin/owasp-threat-dragon-demo/master/ThreatDragonModels/Demo%20Threat%20Model/Demo%20Threat%20Model.json; style-src 'self' https://fonts.googleapis.com 'unsafe-inline'; img-src 'self' data:; font-src 'self' https://fonts.gstatic.com data:; form-action 'self'">
+    <meta http-equiv="Content-Security-Policy" content="default-src 'none'; script-src 'self'; connect-src 'self' https://raw.githubusercontent.com/mike-goodwin/owasp-threat-dragon-demo/master/ThreatDragonModels/Demo%20Threat%20Model/Demo%20Threat%20Model.json; style-src 'self' 'unsafe-inline'; img-src 'self' data:; font-src 'self' data:; form-action 'self'">
     <title>OWASP Threat Dragon</title>
     <link href="content/threatdragon.css" rel="stylesheet" />
+    <link href="content/ubuntu.css" rel="stylesheet" />
     <link href="content/bootstrap-theme.css" rel="stylesheet" />
     <link href="content/bootstrap-custom.css" rel="stylesheet" />