Skip to content

Commit

Permalink
fix: change fira source (#1944)
Browse files Browse the repository at this point in the history
- 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>
  • Loading branch information
wusteven815 and dsmmcken authored Apr 26, 2024
1 parent b235052 commit 07e5a26
Show file tree
Hide file tree
Showing 523 changed files with 45 additions and 17 deletions.
42 changes: 29 additions & 13 deletions package-lock.json

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

5 changes: 3 additions & 2 deletions packages/app-utils/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -47,10 +47,11 @@
"@deephaven/react-hooks": "file:../react-hooks",
"@deephaven/redux": "file:../redux",
"@deephaven/utils": "file:../utils",
"@fontsource/fira-mono": "5.0.13",
"@fontsource/fira-sans": "5.0.20",
"@paciolan/remote-component": "2.13.0",
"@paciolan/remote-module-loader": "^3.0.2",
"classnames": "^2.5.1",
"fira": "mozilla/fira#4.202"
"classnames": "^2.5.1"
},
"peerDependencies": {
"react": ">=16.8.0",
Expand Down
12 changes: 11 additions & 1 deletion packages/app-utils/src/components/FontBootstrap.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,15 @@
import React, { createContext, useEffect, useState } from 'react';
import 'fira';
import '@fontsource/fira-mono/400.css';
import '@fontsource/fira-mono/500.css';
import '@fontsource/fira-mono/700.css';
import '@fontsource/fira-sans/300.css';
import '@fontsource/fira-sans/300-italic.css';
import '@fontsource/fira-sans/400.css';
import '@fontsource/fira-sans/400-italic.css';
import '@fontsource/fira-sans/500.css';
import '@fontsource/fira-sans/600.css';
import '@fontsource/fira-sans/700.css';
import '@fontsource/fira-sans/700-italic.css';

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

Expand Down
3 changes: 2 additions & 1 deletion packages/embed-widget/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,8 @@
"@deephaven/plugin": "file:../plugin",
"@deephaven/redux": "file:../redux",
"@deephaven/utils": "file:../utils",
"fira": "mozilla/fira#4.202",
"@fontsource/fira-mono": "5.0.13",
"@fontsource/fira-sans": "5.0.20",
"react": "^17.0.2",
"react-dom": "^17.0.2",
"react-redux": "^7.2.4",
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified tests/context-menu.spec.ts-snapshots/go-to-1-chromium-linux.png
Binary file modified tests/context-menu.spec.ts-snapshots/go-to-1-firefox-linux.png
Binary file modified tests/context-menu.spec.ts-snapshots/go-to-1-webkit-linux.png
Binary file modified tests/context-menu.spec.ts-snapshots/go-to-2-chromium-linux.png
Binary file modified tests/context-menu.spec.ts-snapshots/go-to-2-firefox-linux.png
Binary file modified tests/context-menu.spec.ts-snapshots/go-to-2-webkit-linux.png
Binary file modified tests/context-menu.spec.ts-snapshots/go-to-3-chromium-linux.png
Binary file modified tests/context-menu.spec.ts-snapshots/go-to-3-firefox-linux.png
Binary file modified tests/context-menu.spec.ts-snapshots/go-to-3-webkit-linux.png
Binary file modified tests/context-menu.spec.ts-snapshots/sort-by-1-chromium-linux.png
Binary file modified tests/context-menu.spec.ts-snapshots/sort-by-1-firefox-linux.png
Binary file modified tests/context-menu.spec.ts-snapshots/sort-by-1-webkit-linux.png
Binary file modified tests/context-menu.spec.ts-snapshots/sort-by-2-chromium-linux.png
Binary file modified tests/context-menu.spec.ts-snapshots/sort-by-2-firefox-linux.png
Binary file modified tests/context-menu.spec.ts-snapshots/sort-by-2-webkit-linux.png
Binary file modified tests/context-menu.spec.ts-snapshots/sort-by-3-chromium-linux.png
Binary file modified tests/context-menu.spec.ts-snapshots/sort-by-3-firefox-linux.png
Binary file modified tests/context-menu.spec.ts-snapshots/sort-by-3-webkit-linux.png
Binary file modified tests/styleguide.spec.ts-snapshots/buttons-inline-firefox-linux.png
Binary file modified tests/styleguide.spec.ts-snapshots/buttons-inline-webkit-linux.png
Binary file modified tests/styleguide.spec.ts-snapshots/buttons-outline-webkit-linux.png
Binary file modified tests/styleguide.spec.ts-snapshots/chart-colors-chromium-linux.png
Binary file modified tests/styleguide.spec.ts-snapshots/chart-colors-webkit-linux.png
Binary file modified tests/styleguide.spec.ts-snapshots/charts-chromium-linux.png
Binary file modified tests/styleguide.spec.ts-snapshots/charts-firefox-linux.png
Binary file modified tests/styleguide.spec.ts-snapshots/charts-webkit-linux.png
Binary file modified tests/styleguide.spec.ts-snapshots/colors-chromium-linux.png
Binary file modified tests/styleguide.spec.ts-snapshots/colors-firefox-linux.png
Binary file modified tests/styleguide.spec.ts-snapshots/colors-webkit-linux.png
Binary file modified tests/styleguide.spec.ts-snapshots/context-menus-firefox-linux.png
Binary file modified tests/styleguide.spec.ts-snapshots/context-menus-webkit-linux.png
Binary file modified tests/styleguide.spec.ts-snapshots/dialog-chromium-linux.png
Binary file modified tests/styleguide.spec.ts-snapshots/dialog-firefox-linux.png
Binary file modified tests/styleguide.spec.ts-snapshots/dialog-webkit-linux.png
Binary file modified tests/styleguide.spec.ts-snapshots/draggable-lists-webkit-linux.png
Binary file modified tests/styleguide.spec.ts-snapshots/dropdown-menus-firefox-linux.png
Binary file modified tests/styleguide.spec.ts-snapshots/dropdown-menus-webkit-linux.png
Binary file modified tests/styleguide.spec.ts-snapshots/editor-colors-chromium-linux.png
Binary file modified tests/styleguide.spec.ts-snapshots/editor-colors-firefox-linux.png
Binary file modified tests/styleguide.spec.ts-snapshots/editor-colors-webkit-linux.png
Binary file modified tests/styleguide.spec.ts-snapshots/editors-chromium-linux.png
Binary file modified tests/styleguide.spec.ts-snapshots/editors-firefox-linux.png
Binary file modified tests/styleguide.spec.ts-snapshots/editors-webkit-linux.png
Binary file modified tests/styleguide.spec.ts-snapshots/golden-layout-firefox-linux.png
Binary file modified tests/styleguide.spec.ts-snapshots/grid-colors-chromium-linux.png
Binary file modified tests/styleguide.spec.ts-snapshots/grid-colors-firefox-linux.png
Binary file modified tests/styleguide.spec.ts-snapshots/grid-colors-webkit-linux.png
Binary file modified tests/styleguide.spec.ts-snapshots/icons-chromium-linux.png
Binary file modified tests/styleguide.spec.ts-snapshots/icons-firefox-linux.png
Binary file modified tests/styleguide.spec.ts-snapshots/icons-webkit-linux.png
Binary file modified tests/styleguide.spec.ts-snapshots/inputs-chromium-linux.png
Binary file modified tests/styleguide.spec.ts-snapshots/inputs-firefox-linux.png
Loading

0 comments on commit 07e5a26

Please sign in to comment.