Merge branch 'feat/v3/main' into feat/v3/app-work

calcom · Feb 12, 2025 · bfadbb2 · bfadbb2
2 parents 542962d + 86259e5
commit bfadbb2
Show file tree

Hide file tree

Showing 13 changed files with 721 additions and 83 deletions.
diff --git a/apps/storybook/.storybook/preview.tsx b/apps/storybook/.storybook/preview.tsx
@@ -7,8 +7,8 @@ import { I18nextProvider } from "react-i18next";
 import type { EmbedThemeConfig } from "@calcom/embed-core/src/types";
 // adds trpc context to all stories (esp. booker)
 import { StorybookTrpcProvider } from "@calcom/ui";
+import "@calcom/ui/css";
 
-import "../styles/globals.css";
 import "../styles/storybook-styles.css";
 import i18n from "./i18next";
 

diff --git a/apps/swagger/pages/_app.tsx b/apps/swagger/pages/_app.tsx
@@ -2,7 +2,7 @@ import "highlight.js/styles/default.css";
 import { type AppProps } from "next/app";
 import "swagger-ui-react/swagger-ui.css";
 
-import "../styles/globals.css";
+import "@calcom/ui/css";
 
 function MyApp({ Component, pageProps }: AppProps) {
   return <Component {...pageProps} />;