Merge branch 'issue-19-local-resources' into 'master'

Add Material icons and Roboto font for local resources (closes #19)

Closes #19

See merge request openlp/web-remote!37
This commit is contained in:
Tim Bentley 2021-06-28 06:17:33 +00:00
commit 7af4f684eb
4 changed files with 16 additions and 3 deletions

View File

@ -26,7 +26,9 @@
"src/assets" "src/assets"
], ],
"styles": [ "styles": [
"src/styles.scss" "src/styles.scss",
"node_modules/material-design-icons/iconfont/material-icons.css",
"node_modules/@fontsource/roboto/400.css"
], ],
"scripts": [] "scripts": []
}, },

View File

@ -35,8 +35,10 @@
"@angular/platform-browser": "^11.0.5", "@angular/platform-browser": "^11.0.5",
"@angular/platform-browser-dynamic": "^11.0.5", "@angular/platform-browser-dynamic": "^11.0.5",
"@angular/router": "^11.0.5", "@angular/router": "^11.0.5",
"@fontsource/roboto": "^4.4.5",
"core-js": "^3.8.1", "core-js": "^3.8.1",
"hammerjs": "^2.0.8", "hammerjs": "^2.0.8",
"material-design-icons": "^3.0.1",
"rxjs": "^6.6.3", "rxjs": "^6.6.3",
"zone.js": "^0.10.3" "zone.js": "^0.10.3"
}, },

View File

@ -7,7 +7,6 @@
<base href="/"> <base href="/">
<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="/assets/favicon.ico"> <link rel="icon" type="image/x-icon" href="/assets/favicon.ico">
<link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet">
</head> </head>
<body> <body>

View File

@ -1135,6 +1135,11 @@
lodash "^4.17.19" lodash "^4.17.19"
to-fast-properties "^2.0.0" to-fast-properties "^2.0.0"
"@fontsource/roboto@^4.4.5":
version "4.4.5"
resolved "https://registry.yarnpkg.com/@fontsource/roboto/-/roboto-4.4.5.tgz#9ef1b9288ac4a97b97906da920c63c08dba97c89"
integrity sha512-e3s7BF8MDBLpkA2r6lnl5PMnllF0McVvpolK9h2zzvVJw2WPexP1GTgMKHISlglYZRij2lKg/ZjQcIUUYDsAXg==
"@istanbuljs/schema@^0.1.2": "@istanbuljs/schema@^0.1.2":
version "0.1.2" version "0.1.2"
resolved "https://registry.yarnpkg.com/@istanbuljs/schema/-/schema-0.1.2.tgz#26520bf09abe4a5644cd5414e37125a8954241dd" resolved "https://registry.yarnpkg.com/@istanbuljs/schema/-/schema-0.1.2.tgz#26520bf09abe4a5644cd5414e37125a8954241dd"
@ -5403,6 +5408,11 @@ map-visit@^1.0.0:
dependencies: dependencies:
object-visit "^1.0.0" object-visit "^1.0.0"
material-design-icons@^3.0.1:
version "3.0.1"
resolved "https://registry.yarnpkg.com/material-design-icons/-/material-design-icons-3.0.1.tgz#9a71c48747218ebca51e51a66da682038cdcb7bf"
integrity sha1-mnHEh0chjrylHlGmbaaCA4zct78=
md5.js@^1.3.4: md5.js@^1.3.4:
version "1.3.5" version "1.3.5"
resolved "https://registry.yarnpkg.com/md5.js/-/md5.js-1.3.5.tgz#b5d07b8e3216e3e27cd728d72f70d1e6a342005f" resolved "https://registry.yarnpkg.com/md5.js/-/md5.js-1.3.5.tgz#b5d07b8e3216e3e27cd728d72f70d1e6a342005f"