StarMC/Astral-nook
StarMC/Astral-nook
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Update to Tailwind 3; support normal tailwind usage without twin.macro

Browse source
This commit is contained in:
DaneEveritt 2022-06-05 14:34:29 -04:00
parent 21ca91abd0
commit 921da09a63
No known key found for this signature in database
GPG key ID: EEA66103B3D71F53
9 changed files with 1262 additions and 467 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -9,12 +9,13 @@ import AuthenticationRouter from '@/routers/AuthenticationRouter';
import { SiteSettings } from '@/state/settings';
import ProgressBar from '@/components/elements/ProgressBar';
import { NotFound } from '@/components/elements/ScreenBlock';
import tw, { GlobalStyles as TailwindGlobalStyles } from 'twin.macro';
import tw from 'twin.macro';
import GlobalStylesheet from '@/assets/css/GlobalStylesheet';
import { history } from '@/components/history';
import { setupInterceptors } from '@/api/interceptors';
import AuthenticatedRoute from '@/components/elements/AuthenticatedRoute';
import { ServerContext } from '@/state/server';
import '@/assets/tailwind.css';
interface ExtendedWindow extends Window {
SiteConfiguration?: SiteSettings;
@ -56,7 +57,6 @@ const App = () => {
return (
<>
<GlobalStylesheet/>
<TailwindGlobalStyles/>
<StoreProvider store={store}>
<ProgressBar/>
<div css={tw`mx-auto w-auto`}>