Skip to content

Commit

Permalink
merged main, made css changes
Browse files Browse the repository at this point in the history
  • Loading branch information
BeeSeeWhy committed Jul 24, 2024
2 parents 29a260f + 4fd2ba0 commit 05f4f0f
Show file tree
Hide file tree
Showing 15 changed files with 9,692 additions and 6,299 deletions.
5 changes: 2 additions & 3 deletions .storybook/main.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,12 @@ const config: StorybookConfig = {
"@storybook/addon-onboarding",
"@storybook/addon-interactions",
"@tomfreudenberg/next-auth-mock/storybook",
"@chromatic-com/storybook",
],
framework: {
name: "@storybook/nextjs",
options: {},
},
docs: {
autodocs: "tag",
},
docs: {},
};
export default config;
2 changes: 1 addition & 1 deletion .storybook/preview.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import React from "react";
import type { Preview } from "@storybook/react";
import { StyledEngineProvider, ThemeProvider } from "@mui/material/styles";
import { theme } from "../src/theme";
import { compassTheme as theme } from "../src/theme";
import { FontProvider } from "../src/components/font-provider";

import "../src/styles/globals.css";
Expand Down
2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,8 @@ There are two ways to run Compass locally:

Server URL: http://localhost:3000

NOTE: If you get into a login loop, double check that the Docker services are running

**Option 2: Run both server and supporting services locally**

1. One time setup:
Expand Down
Loading

0 comments on commit 05f4f0f

Please sign in to comment.