Merge pull request #104 from reactiveops/rb/assets

save all third-party assets to local files
FairwindsOps · May 17, 2019 · 2117a47 · 2117a47
2 parents a0b2cfa + cd58867
commit 2117a47
Show file tree

Hide file tree

Showing 13 changed files with 75 additions and 9 deletions.
diff --git a/pkg/dashboard/assets/css/Muli.css b/pkg/dashboard/assets/css/Muli.css
@@ -0,0 +1,18 @@
+@font-face {
+  font-family: 'Muli';
+  font-style: normal;
+  font-weight: 300;
+  src: local('Muli Light'), local('Muli-Light'), url(/static/webfonts/Muli-Light.tff) format('truetype');
+}
+@font-face {
+  font-family: 'Muli';
+  font-style: normal;
+  font-weight: 400;
+  src: local('Muli Regular'), local('Muli-Regular'), url(/static/webfonts/Muli-Regular.tff) format('truetype');
+}
+@font-face {
+  font-family: 'Muli';
+  font-style: normal;
+  font-weight: 700;
+  src: local('Muli Bold'), local('Muli-Bold'), url(/static/webfonts/Muli-Bold.tff) format('truetype');
+}
diff --git a/pkg/dashboard/assets/css/fontawesome-5.7.2.css b/pkg/dashboard/assets/css/fontawesome-5.7.2.css
diff --git a/pkg/dashboard/assets/js/Chart-2.7.2.min.js b/pkg/dashboard/assets/js/Chart-2.7.2.min.js
diff --git a/pkg/dashboard/assets/js/cash-4.1.2.min.js b/pkg/dashboard/assets/js/cash-4.1.2.min.js
diff --git a/pkg/dashboard/assets/webfonts/Muli-Bold.tff b/pkg/dashboard/assets/webfonts/Muli-Bold.tff
diff --git a/pkg/dashboard/assets/webfonts/Muli-Light.tff b/pkg/dashboard/assets/webfonts/Muli-Light.tff
diff --git a/pkg/dashboard/assets/webfonts/Muli-Regular.tff b/pkg/dashboard/assets/webfonts/Muli-Regular.tff
diff --git a/pkg/dashboard/assets/webfonts/fa-regular-400.woff b/pkg/dashboard/assets/webfonts/fa-regular-400.woff
diff --git a/pkg/dashboard/assets/webfonts/fa-regular-400.woff2 b/pkg/dashboard/assets/webfonts/fa-regular-400.woff2
diff --git a/pkg/dashboard/assets/webfonts/fa-solid-900.woff b/pkg/dashboard/assets/webfonts/fa-solid-900.woff
diff --git a/pkg/dashboard/assets/webfonts/fa-solid-900.woff2 b/pkg/dashboard/assets/webfonts/fa-solid-900.woff2
diff --git a/pkg/dashboard/templates/head.gohtml b/pkg/dashboard/templates/head.gohtml
@@ -7,8 +7,15 @@
 
   <link rel="icon" type="image/png" href="/static/favicon-32x32.png" sizes="32x32" />
   <link rel="icon" type="image/png" href="/static/favicon-16x16.png" sizes="16x16" />
-  <link href="https://fonts.googleapis.com/css?family=Muli:300,400,700" rel="stylesheet">
+  <link href="/static/css/Muli.css" rel="stylesheet">
   <link rel="stylesheet" href="/static/css/normalize.css">
   <link rel="stylesheet" href="/static/css/main.css">
-  <link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.7.2/css/all.css" integrity="sha384-fnmOCqbTlWIlj8LyTjo7mOUStjsKC4pOpQbqyi7RrhN7udi9RwhKkMHpvLbHG9Sr" crossorigin="anonymous">
+  <link rel="stylesheet" href="/static/css/fontawesome-5.7.2.css">
+  <link rel="stylesheet" href="/static/css/dashboard.css">
+  <script type="text/javascript" src="/static/js/Chart-2.7.2.min.js"></script>
+  <script type="text/javascript" src="/static/js/cash-4.1.2.min.js"></script>
+  <script>
+    window.polarisAuditData = {{ .JSON }};
+  </script>
+  <script type="text/javascript" src="/static/js/main.js"></script>
 {{ end }}
diff --git a/pkg/dashboard/templates/main.gohtml b/pkg/dashboard/templates/main.gohtml
@@ -3,13 +3,6 @@
 
 <head>
   {{ template "head" . }}
-  <link rel="stylesheet" href="/static/css/dashboard.css">
-  <script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/Chart.js/2.7.2/Chart.min.js"></script>
-  <script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/cash/3.0.0-beta.3/cash.min.js"></script>
-  <script>
-    window.polarisAuditData = {{ .JSON }};
-  </script>
-  <script type="text/javascript" src="/static/js/main.js"></script>
 </head>
 
 <body>