Skip to content

refactor: start using emotion for styling #9909

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 17 commits into from
Sep 29, 2023
Merged

refactor: start using emotion for styling #9909

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
af6b435
some largely unrelated cleanup
aslilac Sep 28, 2023
88e6640
get emotional
aslilac Sep 28, 2023
070e13b
apologize to the json gods
aslilac Sep 28, 2023
50d8374
`make gen`
aslilac Sep 29, 2023
4d45704
a bunch more good ones
aslilac Sep 29, 2023
9704175
fix types
aslilac Sep 29, 2023
025a920
this is killing me
aslilac Sep 29, 2023
477c6cb
allow css prop
aslilac Sep 29, 2023
d34e687
fancy `Theme` shenanigans
aslilac Sep 29, 2023
ec9d32e
port a couple more!
aslilac Sep 29, 2023
2eb88a8
>:(
aslilac Sep 29, 2023
33f89c3
one more!
aslilac Sep 29, 2023
9f6d826
caught some mistakes
aslilac Sep 29, 2023
b06ccdc
do a couple more (to fix storybook)
aslilac Sep 29, 2023
f8f9ed2
Merge branch 'main' into emotional-damage
aslilac Sep 29, 2023
cebd48a
🤬
aslilac Sep 29, 2023
2a2367e
fix linting
aslilac Sep 29, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
get emotional
  • Loading branch information
@aslilac
aslilac committed Sep 28, 2023
commit 88e66406f98d0fefd58f2484ab2aa6ddf0c8eb66
20 changes: 13 additions & 7 deletions site/.storybook/preview.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,24 @@
import CssBaseline from "@mui/material/CssBaseline";
import { StyledEngineProvider, ThemeProvider } from "@mui/material/styles";
import {
StyledEngineProvider,
ThemeProvider as MuiThemeProvider,
} from "@mui/material/styles";
import { ThemeProvider as EmotionThemeProvider } from "@emotion/react";
import { withRouter } from "storybook-addon-react-router-v6";
import { HelmetProvider } from "react-helmet-async";
import { dark } from "../src/theme";
import "../src/theme/globalFonts";
import { dark } from "theme";
import "theme/globalFonts";
import { QueryClient, QueryClientProvider } from "@tanstack/react-query";

export const decorators = [
(Story) => (
<StyledEngineProvider injectFirst>
<ThemeProvider theme={dark}>
<CssBaseline />
<Story />
</ThemeProvider>
<MuiThemeProvider theme={dark}>
<EmotionThemeProvider theme={dark}>
<CssBaseline />
<Story />
</EmotionThemeProvider>
</MuiThemeProvider>
</StyledEngineProvider>
),
withRouter,
Expand Down
11 changes: 6 additions & 5 deletions site/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@
"dependencies": {
"@emoji-mart/data": "1.1.2",
"@emoji-mart/react": "1.0.1",
"@emotion/css": "11.11.2",
"@emotion/react": "11.11.1",
"@emotion/styled": "11.11.0",
"@fastly/performance-observer-polyfill": "2.0.0",
Expand All @@ -45,11 +46,6 @@
"@mui/styles": "5.14.0",
"@mui/system": "5.14.0",
"@tanstack/react-query": "4.35.3",
"@types/color-convert": "2.0.0",
"@types/lodash": "4.14.196",
"@types/react-color": "3.0.6",
"@types/react-date-range": "1.4.4",
"@types/semver": "7.5.0",
"@vitejs/plugin-react": "4.0.1",
"@xstate/inspect": "0.8.0",
"@xstate/react": "3.2.1",
Expand Down Expand Up @@ -121,15 +117,20 @@
"@testing-library/react-hooks": "8.0.1",
"@testing-library/user-event": "14.5.1",
"@types/chroma-js": "2.4.0",
"@types/color-convert": "2.0.0",
"@types/express": "4.17.17",
"@types/jest": "29.5.2",
"@types/lodash": "4.14.196",
"@types/node": "18.17.0",
"@types/react": "18.2.6",
"@types/react-color": "3.0.6",
"@types/react-date-range": "1.4.4",
"@types/react-dom": "18.2.4",
"@types/react-helmet": "6.1.5",
"@types/react-syntax-highlighter": "15.5.5",
"@types/react-virtualized-auto-sizer": "1.0.1",
"@types/react-window": "1.8.5",
"@types/semver": "7.5.0",
"@types/ssh2": "1.11.13",
"@types/ua-parser-js": "0.7.36",
"@types/uuid": "9.0.2",
Expand Down
Loading