Skip to content

Commit

Permalink
chore: Merge branch 'develop' of https://github.com/null2264/Ghostbox
Browse files Browse the repository at this point in the history
…into refactor/ftl
  • Loading branch information
null2264 committed Oct 25, 2023
2 parents cb752a9 + 9e9603b commit cd2f8b7
Show file tree
Hide file tree
Showing 4 changed files with 989 additions and 987 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
"@fluent/bundle": "^0.18.0",
"@fluent/langneg": "^0.7.0",
"@fluent/react": "^0.15.2",
"@fontsource/inter": "^4.5.1",
"@fontsource/nunito-sans": "^5.0.8",
"@fontsource/roboto-mono": "^4.5.8",
"@formatjs/icu-messageformat-parser": "^2.6.0",
"@gamestdio/websocket": "^0.3.2",
Expand Down
15 changes: 8 additions & 7 deletions src/soapbox/main.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,14 @@ import { createRoot } from 'react-dom/client';
import * as BuildConfig from 'soapbox/build-config';
import { printConsoleWarning } from 'soapbox/utils/console';

import '@fontsource/inter/200.css';
import '@fontsource/inter/300.css';
import '@fontsource/inter/400.css';
import '@fontsource/inter/500.css';
import '@fontsource/inter/600.css';
import '@fontsource/inter/700.css';
import '@fontsource/inter/900.css';
import '@fontsource/nunito-sans/200.css';
import '@fontsource/nunito-sans/300.css';
import '@fontsource/nunito-sans/400.css';
import '@fontsource/nunito-sans/500.css';
import '@fontsource/nunito-sans/600.css';
import '@fontsource/nunito-sans/700.css';
import '@fontsource/nunito-sans/800.css';
import '@fontsource/nunito-sans/900.css';
import '@fontsource/roboto-mono/400.css';
import 'line-awesome/dist/font-awesome-line-awesome/css/all.css';
import 'react-datepicker/dist/react-datepicker.css';
Expand Down
2 changes: 1 addition & 1 deletion tailwind.config.cjs
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ module.exports = {
},
fontFamily: {
'sans': [
'Inter',
'Nunito Sans',
'ui-sans-serif',
'system-ui',
'-apple-system',
Expand Down
Loading

0 comments on commit cd2f8b7

Please sign in to comment.