OSDN Git Service

localized the font face.
authorZhiting Lin <zlin035@uottawa.ca>
Mon, 18 Feb 2019 06:59:15 +0000 (14:59 +0800)
committerZhiting Lin <zlin035@uottawa.ca>
Mon, 18 Feb 2019 06:59:15 +0000 (14:59 +0800)
16 files changed:
package-lock.json
package.json
src/fonts/lato-v14-latin/lato-v14-latin-700.eot [new file with mode: 0644]
src/fonts/lato-v14-latin/lato-v14-latin-700.woff [new file with mode: 0644]
src/fonts/lato-v14-latin/lato-v14-latin-700italic.eot [new file with mode: 0644]
src/fonts/lato-v14-latin/lato-v14-latin-700italic.woff [new file with mode: 0644]
src/fonts/lato-v14-latin/lato-v14-latin-italic.eot [new file with mode: 0644]
src/fonts/lato-v14-latin/lato-v14-latin-italic.woff [new file with mode: 0644]
src/fonts/lato-v14-latin/lato-v14-latin-regular.eot [new file with mode: 0644]
src/fonts/lato-v14-latin/lato-v14-latin-regular.woff [new file with mode: 0644]
src/fonts/montserrat-v12-latin/montserrat-v12-latin-700.eot [new file with mode: 0644]
src/fonts/montserrat-v12-latin/montserrat-v12-latin-700.woff [new file with mode: 0644]
src/fonts/montserrat-v12-latin/montserrat-v12-latin-regular.eot [new file with mode: 0644]
src/fonts/montserrat-v12-latin/montserrat-v12-latin-regular.woff [new file with mode: 0644]
src/index.html
src/styles/App.css

index 966aaca..8439827 100644 (file)
         "object-assign": "4.1.1"
       }
     },
+    "file-loader": {
+      "version": "1.1.11",
+      "resolved": "https://registry.npmjs.org/file-loader/-/file-loader-1.1.11.tgz",
+      "integrity": "sha512-TGR4HU7HUsGg6GCOPJnFk06RhWgEWFLAGWiT6rcD+GRC2keU3s9RGJ+b3Z6/U73jwwNb2gKLJ7YCrp+jvU4ALg==",
+      "dev": true,
+      "requires": {
+        "loader-utils": "1.2.3",
+        "schema-utils": "0.4.7"
+      }
+    },
     "fill-range": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
index 3f3acab..4da0946 100644 (file)
@@ -18,6 +18,7 @@
     "babel-polyfill": "^6.26.0",
     "bytom-js-sdk": "^1.4.0",
     "css-loader": "^1.0.0",
+    "file-loader": "^1.1.11",
     "html-webpack-plugin": "^3.2.0",
     "node-sass": "^4.9.0",
     "sass-loader": "^7.0.1",
diff --git a/src/fonts/lato-v14-latin/lato-v14-latin-700.eot b/src/fonts/lato-v14-latin/lato-v14-latin-700.eot
new file mode 100644 (file)
index 0000000..9d8bfb6
Binary files /dev/null and b/src/fonts/lato-v14-latin/lato-v14-latin-700.eot differ
diff --git a/src/fonts/lato-v14-latin/lato-v14-latin-700.woff b/src/fonts/lato-v14-latin/lato-v14-latin-700.woff
new file mode 100644 (file)
index 0000000..1d9d75b
Binary files /dev/null and b/src/fonts/lato-v14-latin/lato-v14-latin-700.woff differ
diff --git a/src/fonts/lato-v14-latin/lato-v14-latin-700italic.eot b/src/fonts/lato-v14-latin/lato-v14-latin-700italic.eot
new file mode 100644 (file)
index 0000000..80fdf16
Binary files /dev/null and b/src/fonts/lato-v14-latin/lato-v14-latin-700italic.eot differ
diff --git a/src/fonts/lato-v14-latin/lato-v14-latin-700italic.woff b/src/fonts/lato-v14-latin/lato-v14-latin-700italic.woff
new file mode 100644 (file)
index 0000000..f79d9a9
Binary files /dev/null and b/src/fonts/lato-v14-latin/lato-v14-latin-700italic.woff differ
diff --git a/src/fonts/lato-v14-latin/lato-v14-latin-italic.eot b/src/fonts/lato-v14-latin/lato-v14-latin-italic.eot
new file mode 100644 (file)
index 0000000..3a697fa
Binary files /dev/null and b/src/fonts/lato-v14-latin/lato-v14-latin-italic.eot differ
diff --git a/src/fonts/lato-v14-latin/lato-v14-latin-italic.woff b/src/fonts/lato-v14-latin/lato-v14-latin-italic.woff
new file mode 100644 (file)
index 0000000..169e8cf
Binary files /dev/null and b/src/fonts/lato-v14-latin/lato-v14-latin-italic.woff differ
diff --git a/src/fonts/lato-v14-latin/lato-v14-latin-regular.eot b/src/fonts/lato-v14-latin/lato-v14-latin-regular.eot
new file mode 100644 (file)
index 0000000..2400e12
Binary files /dev/null and b/src/fonts/lato-v14-latin/lato-v14-latin-regular.eot differ
diff --git a/src/fonts/lato-v14-latin/lato-v14-latin-regular.woff b/src/fonts/lato-v14-latin/lato-v14-latin-regular.woff
new file mode 100644 (file)
index 0000000..97ab144
Binary files /dev/null and b/src/fonts/lato-v14-latin/lato-v14-latin-regular.woff differ
diff --git a/src/fonts/montserrat-v12-latin/montserrat-v12-latin-700.eot b/src/fonts/montserrat-v12-latin/montserrat-v12-latin-700.eot
new file mode 100644 (file)
index 0000000..8f66da0
Binary files /dev/null and b/src/fonts/montserrat-v12-latin/montserrat-v12-latin-700.eot differ
diff --git a/src/fonts/montserrat-v12-latin/montserrat-v12-latin-700.woff b/src/fonts/montserrat-v12-latin/montserrat-v12-latin-700.woff
new file mode 100644 (file)
index 0000000..cbf44b3
Binary files /dev/null and b/src/fonts/montserrat-v12-latin/montserrat-v12-latin-700.woff differ
diff --git a/src/fonts/montserrat-v12-latin/montserrat-v12-latin-regular.eot b/src/fonts/montserrat-v12-latin/montserrat-v12-latin-regular.eot
new file mode 100644 (file)
index 0000000..58433f2
Binary files /dev/null and b/src/fonts/montserrat-v12-latin/montserrat-v12-latin-regular.eot differ
diff --git a/src/fonts/montserrat-v12-latin/montserrat-v12-latin-regular.woff b/src/fonts/montserrat-v12-latin/montserrat-v12-latin-regular.woff
new file mode 100644 (file)
index 0000000..8a054ad
Binary files /dev/null and b/src/fonts/montserrat-v12-latin/montserrat-v12-latin-regular.woff differ
index 914afe8..c04ca64 100644 (file)
@@ -5,9 +5,6 @@
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <meta http-equiv="X-UA-Compatible" content="ie=edge">
-    <link href="https://fonts.googleapis.com/css?family=Montserrat:400,700" rel="stylesheet" type="text/css">
-    <link href="https://fonts.googleapis.com/css?family=Lato:400,700,400italic,700italic" rel="stylesheet" type="text/css">
-
     <title>Bytom Dapp demo</title>
 </head>
 
index c4663ea..41074f8 100644 (file)
@@ -1,3 +1,59 @@
+/* montserrat-regular - latin */
+@font-face {
+    font-family: 'Montserrat';
+    font-style: normal;
+    font-weight: 400;
+    src: url('../fonts/montserrat-v12-latin/montserrat-v12-latin-regular.eot'); /* IE9 Compat Modes */
+    src: local('Montserrat Regular'), local('Montserrat-Regular'),
+    url('../fonts/montserrat-v12-latin/montserrat-v12-latin-regular.woff') format('woff'); /* Modern Browsers */
+}
+/* montserrat-700 - latin */
+@font-face {
+    font-family: 'Montserrat';
+    font-style: normal;
+    font-weight: 700;
+    src: url('../fonts/montserrat-v12-latin/montserrat-v12-latin-700.eot'); /* IE9 Compat Modes */
+    src: local('Montserrat Bold'), local('Montserrat-Bold'),
+    url('../fonts/montserrat-v12-latin/montserrat-v12-latin-700.woff') format('woff'); /* Modern Browsers */
+}
+
+/* lato-regular - latin */
+@font-face {
+    font-family: 'Lato';
+    font-style: normal;
+    font-weight: 400;
+    src: url('../fonts/lato-v14-latin/lato-v14-latin-regular.eot'); /* IE9 Compat Modes */
+    src: local('Lato Regular'), local('Lato-Regular'),
+    url('../fonts/lato-v14-latin/lato-v14-latin-regular.woff') format('woff'); /* Modern Browsers */
+}
+/* lato-italic - latin */
+@font-face {
+    font-family: 'Lato';
+    font-style: italic;
+    font-weight: 400;
+    src: url('../fonts/lato-v14-latin/lato-v14-latin-italic.eot'); /* IE9 Compat Modes */
+    src: local('Lato Italic'), local('Lato-Italic'),
+    url('../fonts/lato-v14-latin/lato-v14-latin-italic.woff') format('woff'); /* Modern Browsers */
+}
+/* lato-700italic - latin */
+@font-face {
+    font-family: 'Lato';
+    font-style: italic;
+    font-weight: 700;
+    src: url('../fonts/lato-v14-latin/lato-v14-latin-700italic.eot'); /* IE9 Compat Modes */
+    src: local('Lato Bold Italic'), local('Lato-BoldItalic'),
+    url('../fonts/lato-v14-latin/lato-v14-latin-700italic.woff') format('woff'); /* Modern Browsers */
+}
+/* lato-700 - latin */
+@font-face {
+    font-family: 'Lato';
+    font-style: normal;
+    font-weight: 700;
+    src: url('../fonts/lato-v14-latin/lato-v14-latin-700.eot'); /* IE9 Compat Modes */
+    src: local('Lato Bold'), local('Lato-Bold'),
+    url('../fonts/lato-v14-latin/lato-v14-latin-700.woff') format('woff'); /* Modern Browsers */
+}
+
 body {
     font-family: 'Lato';
 }