Skip to content

Commit 07e5a26

Browse files
fix: change fira source (#1944)
- Adds #1902 - Use `@fontsource` instead of GitHub as source - Lock to Fira Sans to 5.0.20 and Fira Mono to 5.0.13 to prevent kerning problems --------- Co-authored-by: Don <dsmmcken@gmail.com>
1 parent b235052 commit 07e5a26

523 files changed

Lines changed: 45 additions & 17 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

package-lock.json

Lines changed: 29 additions & 13 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/app-utils/package.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,10 +47,11 @@
4747
"@deephaven/react-hooks": "file:../react-hooks",
4848
"@deephaven/redux": "file:../redux",
4949
"@deephaven/utils": "file:../utils",
50+
"@fontsource/fira-mono": "5.0.13",
51+
"@fontsource/fira-sans": "5.0.20",
5052
"@paciolan/remote-component": "2.13.0",
5153
"@paciolan/remote-module-loader": "^3.0.2",
52-
"classnames": "^2.5.1",
53-
"fira": "mozilla/fira#4.202"
54+
"classnames": "^2.5.1"
5455
},
5556
"peerDependencies": {
5657
"react": ">=16.8.0",

packages/app-utils/src/components/FontBootstrap.tsx

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,15 @@
11
import React, { createContext, useEffect, useState } from 'react';
2-
import 'fira';
2+
import '@fontsource/fira-mono/400.css';
3+
import '@fontsource/fira-mono/500.css';
4+
import '@fontsource/fira-mono/700.css';
5+
import '@fontsource/fira-sans/300.css';
6+
import '@fontsource/fira-sans/300-italic.css';
7+
import '@fontsource/fira-sans/400.css';
8+
import '@fontsource/fira-sans/400-italic.css';
9+
import '@fontsource/fira-sans/500.css';
10+
import '@fontsource/fira-sans/600.css';
11+
import '@fontsource/fira-sans/700.css';
12+
import '@fontsource/fira-sans/700-italic.css';
313

414
export const FontsLoadedContext = createContext<boolean>(false);
515

packages/embed-widget/package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,8 @@
2828
"@deephaven/plugin": "file:../plugin",
2929
"@deephaven/redux": "file:../redux",
3030
"@deephaven/utils": "file:../utils",
31-
"fira": "mozilla/fira#4.202",
31+
"@fontsource/fira-mono": "5.0.13",
32+
"@fontsource/fira-sans": "5.0.20",
3233
"react": "^17.0.2",
3334
"react-dom": "^17.0.2",
3435
"react-redux": "^7.2.4",
-367 Bytes
-886 Bytes
642 Bytes
-279 Bytes
-716 Bytes
671 Bytes

0 commit comments

Comments
 (0)