Apache
/
nifi
mirror of https://github.com/apache/nifi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[NIFI-13852] replace Roboto font with Inter font (#9360) 

* [NIFI-13852] replace Roboto font with Inter font

* add Inter to WebFont load callback

This closes #9360
This commit is contained in:
Scott Aslan 2024-10-08 13:01:02 -06:00 committed by GitHub
parent 3fd0b264ab
commit 7c9d15b198
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
6 changed files with 25616 additions and 25605 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/service/canvas-view.service.ts
View File

@ -69,7 +69,7 @@ export class CanvasView {
public init(svg: any, canvas: any): void {
WebFont.load({
custom: {
families: ['Roboto', 'flowfont', 'FontAwesome']
families: ['Inter', 'flowfont', 'FontAwesome']
},
active: function () {
// re-render once the fonts have loaded, without the fonts

21
nifi-frontend/src/main/frontend/libs/shared/src/assets/themes/material.scss
View File

@ -18,9 +18,16 @@
@use 'sass:map';
@use '@angular/material' as mat;
@use '@fontsource/roboto/latin.css' as roboto-normal;
@use '@fontsource/roboto/latin-300-italic.css' as roboto-light-italic;
@use '@fontsource/roboto/latin-400-italic.css' as roboto-normal-italic;
@use '@fontsource/inter' as inter-normal;
@use '@fontsource/inter/400.css' as inter-400;
@use '@fontsource/inter/400-italic.css' as inter-italic;
@layer base {
//fonts are loaded by the browser
@font-face {
font-family: 'Inter';
}
}
$primary: (
0: #000000,
@ -222,8 +229,8 @@ $m3-dark-theme: mat.define-theme(
tertiary: $_dark-theme-tertiary
),
typography: (
plain-family: Roboto,
brand-family: Roboto,
plain-family: Inter,
brand-family: Inter,
bold-weight: 700,
regular-weight: 400
),
@ -251,8 +258,8 @@ $m3-light-theme: mat.define-theme(
tertiary: $_light-theme-tertiary
),
typography: (
plain-family: Roboto,
brand-family: Roboto,
plain-family: Inter,
brand-family: Inter,
bold-weight: 700,
regular-weight: 400
),

7
nifi-frontend/src/main/frontend/libs/shared/src/assets/themes/purple.scss
View File

@ -18,6 +18,13 @@
@use 'sass:map';
@use '@angular/material' as mat;
@layer base {
//fonts are loaded by the browser
@font-face {
font-family: Comic Sans MS;
}
}
$m3-material-primary-light-palette: (
primary: (
0: #000000,

3
nifi-frontend/src/main/frontend/libs/shared/tailwind.theme.json
View File

@ -1,8 +1,5 @@
{
"extend": {
"fontFamily": {
"roboto": ["Roboto"]
},
"fontSize": {
"xs": [
"10px",

8
nifi-frontend/src/main/frontend/package-lock.json generated
View File

@ -20,7 +20,7 @@
"@angular/platform-browser-dynamic": "18.2.4",
"@angular/router": "18.2.4",
"@ctrl/ngx-codemirror": "^7.0.0",
"@fontsource/roboto": "^5.0.12",
"@fontsource/inter": "^5.1.0",
"@ngrx/effects": "18.0.2",
"@ngrx/operators": "18.0.2",
"@ngrx/router-store": "18.0.2",
@ -3415,10 +3415,10 @@
"node": "^12.22.0 || ^14.17.0 || >=16.0.0"
}
},
"node_modules/@fontsource/roboto": {
"node_modules/@fontsource/inter": {
"version": "5.1.0",
"resolved": "https://registry.npmjs.org/@fontsource/roboto/-/roboto-5.1.0.tgz",
"integrity": "sha512-cFRRC1s6RqPygeZ8Uw/acwVHqih8Czjt6Q0MwoUoDe9U3m4dH1HmNDRBZyqlMSFwgNAUKgFImncKdmDHyKpwdg=="
"resolved": "https://registry.npmjs.org/@fontsource/inter/-/inter-5.1.0.tgz",
"integrity": "sha512-zKZR3kf1G0noIes1frLfOHP5EXVVm0M7sV/l9f/AaYf+M/DId35FO4LkigWjqWYjTJZGgplhdv4cB+ssvCqr5A=="
},
"node_modules/@happy-dom/jest-environment": {
"version": "14.12.3",

2
nifi-frontend/src/main/frontend/package.json
View File

@ -26,7 +26,7 @@
"@angular/platform-browser-dynamic": "18.2.4",
"@angular/router": "18.2.4",
"@ctrl/ngx-codemirror": "^7.0.0",
"@fontsource/roboto": "^5.0.12",
"@fontsource/inter": "^5.1.0",
"@ngrx/effects": "18.0.2",
"@ngrx/operators": "18.0.2",
"@ngrx/router-store": "18.0.2",