Skynet/misc_pterodactyl-panel
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ui: fix duplicate global styles

Browse source
This commit is contained in:
Matthew Penner 2021-01-29 09:07:15 -07:00
parent 4e1c07d36e
commit 72983e8385
2 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
resources/scripts/components/App.tsx
View file

@ -10,10 +10,11 @@ import AuthenticationRouter from '@/routers/AuthenticationRouter';
import { SiteSettings } from '@/state/settings'; import { SiteSettings } from '@/state/settings';
import ProgressBar from '@/components/elements/ProgressBar'; import ProgressBar from '@/components/elements/ProgressBar';
import NotFound from '@/components/screens/NotFound'; import NotFound from '@/components/screens/NotFound';
import tw, { GlobalStyles as TailwindGlobalStyles } from 'twin.macro'; import tw from 'twin.macro';
import GlobalStylesheet from '@/assets/css/GlobalStylesheet'; import GlobalStylesheet from '@/assets/css/GlobalStylesheet';
import { history } from '@/components/history'; import { history } from '@/components/history';
import { setupInterceptors } from '@/api/interceptors'; import { setupInterceptors } from '@/api/interceptors';
import TailwindGlobalStyles from '@/components/GlobalStyles';
const ChunkedAdminRouter = lazy(() => import(/* webpackChunkName: "admin" */'@/routers/AdminRouter')); const ChunkedAdminRouter = lazy(() => import(/* webpackChunkName: "admin" */'@/routers/AdminRouter'));

6
resources/scripts/components/GlobalStyles.tsx Normal file
View file

@ -0,0 +1,6 @@
import React from 'react';
import { GlobalStyles } from 'twin.macro';
export default () => {
return <GlobalStyles/>;
};