Skip to content
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

Feature/config provider #614

Open
wants to merge 8 commits into
base: feature/ant5
Choose a base branch
from
Open

Feature/config provider #614

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
ee6d0d7
bump antd and typescript, and update build tools and components to wo…
interim17 Nov 4, 2024
334431a
consolidate ts.config
interim17 Nov 4, 2024
1c629d5
Merge branch 'feature/ant5' of https://github.com/simularium/simulari…
interim17 Nov 18, 2024
ad19491
replace ant-vars.less with ConfigProvider
interim17 Nov 20, 2024
2a6b563
semantic color variables names for config provider
interim17 Nov 20, 2024
f24d313
align css var colors and theme color variables, divide light and dark…
interim17 Nov 21, 2024
58c7ea1
consolidate theme variables
interim17 Nov 27, 2024
f9445c5
further consolidate theme variables
interim17 Dec 4, 2024
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
36 changes: 20 additions & 16 deletions src/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import "core-js/es6/set";
import React, { useEffect } from "react";
import { createRoot } from "react-dom/client";
import { Provider, useDispatch, batch } from "react-redux";
import { Layout } from "antd";
import { ConfigProvider, Layout } from "antd";
import { BrowserRouter, Switch, Route, useLocation } from "react-router-dom";

import { APP_ID } from "./constants";
Expand All @@ -21,6 +21,8 @@ import "./style.css";
import { setIsPlaying } from "./state/viewer/actions";
import { clearSimulariumFile } from "./state/trajectory/actions";

import simulariumTheme from "./styles/theme/themeConfig";

export const store = createReduxStore();
interface LocationWithState extends Location {
state: {
Expand Down Expand Up @@ -71,21 +73,23 @@ const App = () => {

return (
<Provider store={store}>
<Layout>
<BrowserRouter
basename={
process.env.GH_BUILD ? "/simularium-website/" : ""
}
>
<ScrollToTop />
{location.pathname !== EMBED_PATHNAME && (
<Header>
<AppHeader />
</Header>
)}
<RouterSwitch />
</BrowserRouter>
</Layout>
<ConfigProvider theme={simulariumTheme} wave={{ disabled: true }}>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

what is wave?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

wave controls some animations that are hard to turn off individually

<Layout>
<BrowserRouter
basename={
process.env.GH_BUILD ? "/simularium-website/" : ""
}
>
<ScrollToTop />
{location.pathname !== EMBED_PATHNAME && (
<Header>
<AppHeader />
</Header>
)}
<RouterSwitch />
</BrowserRouter>
</Layout>
</ConfigProvider>
</Provider>
);
};
Expand Down
235 changes: 0 additions & 235 deletions src/styles/ant-vars.less
View file
Open in desktop

This file was deleted.

Loading
Loading