bigbuffet/bigbuffet-rw
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'font-imports' into 'develop'

Browse source 
Move external CSS imports to main.tsx

See merge request soapbox-pub/soapbox!2182
This commit is contained in:
Alex Gleason 2023-01-16 20:54:51 +00:00
commit 397bd3fa39
2 changed files with 11 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
app/soapbox/main.tsx
View file

@ -1,6 +1,5 @@
import * as OfflinePluginRuntime from '@lcdp/offline-plugin/runtime';
import React from 'react';
import 'react-datepicker/dist/react-datepicker.css';
import { createRoot } from 'react-dom/client';
import { defineMessages } from 'react-intl';
@ -9,6 +8,17 @@ import * as BuildConfig from 'soapbox/build-config';
import { store } from 'soapbox/store';
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/roboto-mono/400.css';
import 'line-awesome/dist/font-awesome-line-awesome/css/all.css';
import 'react-datepicker/dist/react-datepicker.css';
import '../soapbox/iframe';
import '../styles/application.scss';

11
app/styles/application.scss
View file

@ -1,14 +1,3 @@
// Fonts from elsewhere
@import '~line-awesome/dist/font-awesome-line-awesome/css/all.css';
@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/roboto-mono/400.css';
@import 'mixins';
@import 'themes';
@import 'variables';