Sākums Izpētīt Palīdzība
Reģistrēties Pierakstīties
Apq
/
nginx-proxy-manager
spogulis no https://github.com/NginxProxyManager/nginx-proxy-manager.git
1
0
Atdalīts 0
Faili Problēmas 0 Vikivietne
Pārlūkot izejas kodu

Merge pull request #1096 from jc21/serve-fonts-locally

Serves font locally
jc21 4 gadi atpakaļ
vecāks
62a708b416 07bbece704
revīzija
5354c85352
14 mainītis faili ar 54 papildinājumiem un 3 dzēšanām
Dalītais skats Rādīt salīdzināšanas statistiku
  1. 0 1
      frontend/fonts
  2. 1 0
      frontend/fonts/feather
  3. BIN
      frontend/fonts/source-sans-pro/source-sans-pro-v14-latin-ext_latin-700.woff
  4. BIN
      frontend/fonts/source-sans-pro/source-sans-pro-v14-latin-ext_latin-700.woff2
  5. BIN
      frontend/fonts/source-sans-pro/source-sans-pro-v14-latin-ext_latin-700italic.woff
  6. BIN
      frontend/fonts/source-sans-pro/source-sans-pro-v14-latin-ext_latin-700italic.woff2
  7. BIN
      frontend/fonts/source-sans-pro/source-sans-pro-v14-latin-ext_latin-italic.woff
  8. BIN
      frontend/fonts/source-sans-pro/source-sans-pro-v14-latin-ext_latin-italic.woff2
  9. BIN
      frontend/fonts/source-sans-pro/source-sans-pro-v14-latin-ext_latin-regular.woff
  10. BIN
      frontend/fonts/source-sans-pro/source-sans-pro-v14-latin-ext_latin-regular.woff2
  11. 0 1
      frontend/html/partials/header.ejs
  12. 39 0
      frontend/scss/fonts.scss
  13. 1 0
      frontend/scss/styles.scss
  14. 13 1
      frontend/webpack.config.js

+ 0 - 1
frontend/fonts
Parādīt failu 

@@ -1 +0,0 @@
 
-./node_modules/tabler-ui/dist/assets/fonts

+ 1 - 0
frontend/fonts/feather
Parādīt failu 

@@ -0,0 +1 @@
 
+../node_modules/tabler-ui/dist/assets/fonts/feather

BIN
frontend/fonts/source-sans-pro/source-sans-pro-v14-latin-ext_latin-700.woff
Parādīt failu


BIN
frontend/fonts/source-sans-pro/source-sans-pro-v14-latin-ext_latin-700.woff2
Parādīt failu


BIN
frontend/fonts/source-sans-pro/source-sans-pro-v14-latin-ext_latin-700italic.woff
Parādīt failu


BIN
frontend/fonts/source-sans-pro/source-sans-pro-v14-latin-ext_latin-700italic.woff2
Parādīt failu


BIN
frontend/fonts/source-sans-pro/source-sans-pro-v14-latin-ext_latin-italic.woff
Parādīt failu


BIN
frontend/fonts/source-sans-pro/source-sans-pro-v14-latin-ext_latin-italic.woff2
Parādīt failu


BIN
frontend/fonts/source-sans-pro/source-sans-pro-v14-latin-ext_latin-regular.woff
Parādīt failu


BIN
frontend/fonts/source-sans-pro/source-sans-pro-v14-latin-ext_latin-regular.woff2
Parādīt failu


+ 0 - 1
frontend/html/partials/header.ejs
Parādīt failu 

@@ -20,7 +20,6 @@
 
 		<meta name="msapplication-TileColor" content="#333333">
 
 		<meta name="msapplication-config" content="/images/favicons/browserconfig.xml">
 
 		<meta name="theme-color" content="#ffffff">
 
-		<link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Source+Sans+Pro:300,300i,400,400i,500,500i,600,600i,700,700i&amp;subset=latin-ext">
 
 		<link href="/css/main.css?v=<%= version %>" rel="stylesheet">
 
 	</head>
 
 	<body>

+ 39 - 0
frontend/scss/fonts.scss
Parādīt failu 

@@ -0,0 +1,39 @@
 
+/* source-sans-pro-regular - latin-ext_latin */
 
+@font-face {
 
+  font-family: 'Source Sans Pro';
 
+  font-style: normal;
 
+  font-weight: 400;
 
+  src: local(''),
 
+       url('../fonts/source-sans-pro/source-sans-pro-v14-latin-ext_latin-regular.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
 
+       url('../fonts/source-sans-pro/source-sans-pro-v14-latin-ext_latin-regular.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
 
+}
 
+
 
+/* source-sans-pro-italic - latin-ext_latin */
 
+@font-face {
 
+  font-family: 'Source Sans Pro';
 
+  font-style: italic;
 
+  font-weight: 400;
 
+  src: local(''),
 
+       url('../fonts/source-sans-pro/source-sans-pro-v14-latin-ext_latin-italic.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
 
+       url('../fonts/source-sans-pro/source-sans-pro-v14-latin-ext_latin-italic.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
 
+}
 
+
 
+/* source-sans-pro-700italic - latin-ext_latin */
 
+@font-face {
 
+  font-family: 'Source Sans Pro';
 
+  font-style: italic;
 
+  font-weight: 700;
 
+  src: local(''),
 
+       url('../fonts/source-sans-pro/source-sans-pro-v14-latin-ext_latin-700italic.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
 
+       url('../fonts/source-sans-pro/source-sans-pro-v14-latin-ext_latin-700italic.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
 
+}
 
+
 
+/* source-sans-pro-700 - latin-ext_latin */
 
+@font-face {
 
+  font-family: 'Source Sans Pro';
 
+  font-style: normal;
 
+  font-weight: 700;
 
+  src: local(''),
 
+       url('../fonts/source-sans-pro/source-sans-pro-v14-latin-ext_latin-700.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
 
+       url('../fonts/source-sans-pro/source-sans-pro-v14-latin-ext_latin-700.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
 
+}

+ 1 - 0
frontend/scss/styles.scss
Parādīt failu 

@@ -1,5 +1,6 @@
 
 @import "~tabler-ui/dist/assets/css/dashboard";
 
 @import "tabler-extra";
 
+@import "fonts";
 
 @import "selectize";
 
 @import "custom";

+ 13 - 1
frontend/webpack.config.js
Parādīt failu 

@@ -90,7 +90,19 @@ module.exports = {
 
 						}
 
 					}
 
 				]
 
-			}
 
+			},
 
+			{
 
+        test: /source-sans-pro.*\.(woff(2)?)(\?v=\d+\.\d+\.\d+)?$/,
 
+        use: [
 
+          {
 
+            loader: 'file-loader',
 
+            options: {
 
+              name: '[name].[ext]',
 
+              outputPath: 'assets/'
 
+            }
 
+          }
 
+        ]
 
+      }
 
 		]
 
 	},
 
 	plugins:   [