dendi-wang/thingsboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #3831 from vvlladd28/improvement/font/material-load

Browse Source 
UI: Added preload Material Icons font
This commit is contained in:
Igor Kulikov 2020-12-11 16:20:07 +02:00 committed by GitHub
commit 0407b842d2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ui-ngx/angular.json
View File

@ -59,6 +59,11 @@
"glob": "marker-shadow.png", "glob": "marker-shadow.png",
"input": "node_modules/leaflet/dist/images/", "input": "node_modules/leaflet/dist/images/",
"output": "/" "output": "/"
},
{
"glob": "**/*",
"input": "node_modules/material-design-icons/iconfont/",
"output": "/fonts"
} }
], ],
"styles": [ "styles": [

2
ui-ngx/src/index.html
View File

@ -24,6 +24,8 @@
<meta name="viewport" content="width=device-width, initial-scale=1"> <meta name="viewport" content="width=device-width, initial-scale=1">
<link rel="icon" type="image/x-icon" href="thingsboard.ico"> <link rel="icon" type="image/x-icon" href="thingsboard.ico">
<link rel="preload" href="fonts/MaterialIcons-Regular.woff2" as="font" type="font/woff2" crossorigin="anonymous" />
<link rel="stylesheet" href="fonts/material-icons.css" />
<style type="text/css"> <style type="text/css">
body, html { body, html {

1
ui-ngx/src/styles.scss
View File

@ -15,7 +15,6 @@
*/ */
/* You can add global styles to this file, and also import other style files */ /* You can add global styles to this file, and also import other style files */
@import '~material-design-icons/iconfont/material-icons.css';
@import '~typeface-roboto/index.css'; @import '~typeface-roboto/index.css';
@import '~font-awesome/css/font-awesome.min.css'; @import '~font-awesome/css/font-awesome.min.css';
@import 'theme.scss'; @import 'theme.scss';