Skip to content

Resolve #2728: Added fontsource usage instead google fonts #2731

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 5 commits into from
Closed

Resolve #2728: Added fontsource usage instead google fonts #2731

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d29ac1d
Google fonts call removed, fontsource fonts used instead gfonts
Oct 12, 2022
9100aca
Merge branch 'master' into issues/2728
David-DB88 Mar 20, 2023
00d5c4b
resolve conflicts
David-DB88 Mar 20, 2023
d642608
pnpm-lock.yaml is not up-to-date with package.json
David-DB88 Mar 20, 2023
e57319d
jest 29.5.0 install version
David-DB88 Mar 20, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 0 additions & 7 deletions kafka-ui-react-app/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,6 @@
<head>
<meta charset="utf-8" />
<meta name="viewport" content="width=device-width, initial-scale=1" />
<!-- Google fonts -->
<link rel="preconnect" href="https://fonts.googleapis.com" />
<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin />
<link
href="https://fonts.googleapis.com/css2?family=Inter:wght@400;500&family=Roboto+Mono:wght@400;500&display=swap"
rel="stylesheet"
/>

<!-- Favicons -->
<link rel="icon" href="<%= PUBLIC_PATH %>/favicon/favicon.ico" sizes="any" />
Expand Down
4 changes: 3 additions & 1 deletion kafka-ui-react-app/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@
"private": true,
"dependencies": {
"@floating-ui/react": "^0.19.2",
"@fontsource/inter": "^4.5.15",
"@fontsource/roboto-mono": "^4.5.10",
"@hookform/error-message": "^2.0.0",
"@hookform/resolvers": "^2.7.1",
"@microsoft/fetch-event-source": "^2.0.1",
Expand All @@ -19,7 +21,7 @@
"ajv-formats": "^2.1.1",
"classnames": "^2.2.6",
"fetch-mock": "^9.11.0",
"jest": "^29.4.3",
"jest": "29.5.0",
"jest-watch-typeahead": "^2.2.2",
"json-schema-faker": "^0.5.0-rcv.44",
"jsonpath-plus": "^7.2.0",
Expand Down
20 changes: 17 additions & 3 deletions kafka-ui-react-app/pnpm-lock.yaml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions kafka-ui-react-app/src/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import { Provider } from 'react-redux';
import App from 'components/App';
import { store } from 'redux/store';
import 'lib/constants';
import 'theme/fonts.scss';
import 'theme/index.scss';

const container =
Expand Down
4 changes: 4 additions & 0 deletions kafka-ui-react-app/src/theme/fonts.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
@import "@fontsource/inter/400.css";
@import "@fontsource/inter/500.css";
@import "@fontsource/roboto-mono/400.css";
@import "@fontsource/roboto-mono/500.css";