Merge branch 'beta' of github.com:Ifsttar/NoiseCapture into changeSta…

…rtPage
Universite-Gustave-Eiffel · Oct 27, 2022 · 1cf4f29 · 1cf4f29
2 parents e0eaa35 + b265694
commit 1cf4f29
Show file tree

Hide file tree

Showing 13 changed files with 35 additions and 4 deletions.
diff --git a/app/src/main/assets/html/font/DroidSerif-Bold.ttf b/app/src/main/assets/html/font/DroidSerif-Bold.ttf
diff --git a/app/src/main/assets/html/font/DroidSerif-BoldItalic.ttf b/app/src/main/assets/html/font/DroidSerif-BoldItalic.ttf
diff --git a/app/src/main/assets/html/font/DroidSerif-Italic.ttf b/app/src/main/assets/html/font/DroidSerif-Italic.ttf
diff --git a/app/src/main/assets/html/font/DroidSerif-Regular.ttf b/app/src/main/assets/html/font/DroidSerif-Regular.ttf
diff --git a/app/src/main/assets/html/font/roboto-v29-latin-700.ttf b/app/src/main/assets/html/font/roboto-v29-latin-700.ttf
diff --git a/app/src/main/assets/html/font/roboto-v29-latin-700.woff b/app/src/main/assets/html/font/roboto-v29-latin-700.woff
diff --git a/app/src/main/assets/html/font/roboto-v29-latin-700.woff2 b/app/src/main/assets/html/font/roboto-v29-latin-700.woff2
diff --git a/app/src/main/assets/html/font/roboto-v29-latin-regular.ttf b/app/src/main/assets/html/font/roboto-v29-latin-regular.ttf
diff --git a/app/src/main/assets/html/font/roboto-v29-latin-regular.woff b/app/src/main/assets/html/font/roboto-v29-latin-regular.woff
diff --git a/app/src/main/assets/html/font/roboto-v29-latin-regular.woff2 b/app/src/main/assets/html/font/roboto-v29-latin-regular.woff2
diff --git a/app/src/main/assets/html/help.html b/app/src/main/assets/html/help.html
@@ -2,9 +2,7 @@
   <head>
     <meta content="text/html; charset=windows-1252" http-equiv="content-type">
     <meta name="generator" content="HTML Tidy for HTML5 (experimental) for Windows https://github.com/w3c/tidy-html5/tree/c63cc39">
-    <link href="http://fonts.googleapis.com/css?family=Droid+Serif" type="text/css"
-
-      rel="stylesheet">
+    <link href="style/droidserif.css" type="text/css" rel="stylesheet">
     <link rel="stylesheet" href="style/style.css">
     <title>NoiseCapture App Help</title>
   </head>

diff --git a/app/src/main/assets/html/style/bootstrap.css b/app/src/main/assets/html/style/bootstrap.css
@@ -1,4 +1,3 @@
-@import url("https://fonts.googleapis.com/css?family=Roboto:400,700");
 /*!
  * bootswatch v3.3.7
  * Homepage: http://bootswatch.com
@@ -12,6 +11,29 @@
  * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
  */
 /*! normalize.css v3.0.3 | MIT License | github.com/necolas/normalize.css */
+/* roboto-regular - latin */
+
+@font-face {
+  font-family: 'Roboto';
+  font-style: normal;
+  font-weight: 400;
+  src: local(''),
+       url('../fonts/roboto-v29-latin-regular.woff2') format('woff2'), /* Super Modern Browsers */
+       url('../fonts/roboto-v29-latin-regular.woff') format('woff'), /* Modern Browsers */
+       url('../fonts/roboto-v29-latin-regular.ttf') format('truetype'), /* Safari, Android, iOS */
+}
+
+/* roboto-700 - latin */
+@font-face {
+  font-family: 'Roboto';
+  font-style: normal;
+  font-weight: 700;
+  src: local(''),
+       url('../fonts/roboto-v29-latin-700.woff2') format('woff2'), /* Super Modern Browsers */
+       url('../fonts/roboto-v29-latin-700.woff') format('woff'), /* Modern Browsers */
+       url('../fonts/roboto-v29-latin-700.ttf') format('truetype'), /* Safari, Android, iOS */
+}
+
 html {
   font-family: sans-serif;
   -ms-text-size-adjust: 100%;

diff --git a/app/src/main/assets/html/style/droidserif.css b/app/src/main/assets/html/style/droidserif.css
@@ -0,0 +1,11 @@
+/* latin */
+@font-face {
+  font-family: 'Droid Serif';
+  font-style: normal;
+  font-weight: 400;
+  src: url('../fonts/DroidSerif-Regular.woff2') format('woff2'), /* Super Modern Browsers */
+       url('../fonts/DroidSerif-Regular.woff') format('woff'), /* Modern Browsers */
+       url('../fonts/DroidSerif-Regular.ttf') format('truetype'), /* Safari, Android, iOS */
+  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;
+}
+