Merge pull request #710 from georchestra/remove-cdn-resources

Add js,css,font resource to avoid external dependencies
georchestra · Apr 17, 2024 · 6942bb9 · 6942bb9
2 parents 7f5b062 + 1269d56
commit 6942bb9
Show file tree

Hide file tree

Showing 8 changed files with 24 additions and 8 deletions.
diff --git a/assets/css/font-awesome.min.css b/assets/css/font-awesome.min.css
diff --git a/assets/fonts/NotoSans.ttf b/assets/fonts/NotoSans.ttf
diff --git a/assets/fonts/fontawesome-webfont.ttf b/assets/fonts/fontawesome-webfont.ttf
diff --git a/assets/fonts/fontawesome-webfont.woff2 b/assets/fonts/fontawesome-webfont.woff2
diff --git a/assets/js/es5.js b/assets/js/es5.js
diff --git a/assets/js/proj4.js b/assets/js/proj4.js
diff --git a/index.html b/index.html
@@ -115,9 +115,13 @@
         }
 
         </style>
-        <link rel="preconnect" href="https://fonts.gstatic.com">
-        <link href="https://fonts.googleapis.com/css2?family=Noto+Sans&display=swap" rel="stylesheet">
-        <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css" />
+        <style>
+            @font-face {
+                font-family: 'Noto Sans';
+                src: local('Noto Sans'), local('NotoSans-Regular'), url(assets/fonts/NotoSans.ttf) format('truetype');
+            }
+        </style>
+        <link rel="stylesheet" href="assets/css/font-awesome.min.css" />
         <link rel="shortcut icon" type="image/png" href="/favicon.ico" />
         <!--script src="https://cdnjs.cloudflare.com/ajax/libs/proj4js/2.3.10/proj4.js"></script-->
         <!--<script src="https://www.mapquestapi.com/sdk/leaflet/v2.2/mq-map.js?key=__API_KEY_MAPQUEST__"></script>-->

diff --git a/indexTemplate.html b/indexTemplate.html
@@ -114,12 +114,16 @@
           width: 100%;
       }
       </style>
-      <link rel="preconnect" href="https://fonts.gstatic.com">
-      <link href="https://fonts.googleapis.com/css2?family=Noto+Sans&display=swap" rel="stylesheet">
-      <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css" />
       <link rel="shortcut icon" type="image/png" href="/favicon.ico" />
-      <script src="https://cdnjs.cloudflare.com/ajax/libs/proj4js/2.3.10/proj4.js"></script>
-      <script async type="text/javascript" src="https://unpkg.com/[email protected]/es5.js" onload="checkBrowser()"></script>
+      <style>
+          @font-face {
+                font-family: 'Noto Sans';
+                src: local('Noto Sans'), local('NotoSans-Regular'), url(assets/fonts/NotoSans.ttf) format('truetype');
+          }
+      </style>
+      <link rel="stylesheet" href="assets/css/font-awesome.min.css" />
+      <script src="assets/js/proj4.js"></script>
+      <script async type="text/javascript" src="assets/js/es5.js" onload="checkBrowser()"></script>
       <script type="text/javascript">
           function checkBrowser() {
               var browserInfo = bowser.getParser(window.navigator.userAgent);