Skip to content

Commit 84f08dd

Browse files
committed
Merge remote-tracking branch 'upstream/main' into clp-s-library-refactoring
2 parents 8e39d8e + 0b2c5a7 commit 84f08dd

File tree

4 files changed

+31
-3
lines changed

4 files changed

+31
-3
lines changed

components/log-viewer-webui/client/src/AntdApp.tsx

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
import {RouterProvider} from "react-router";
22

3+
import {ConfigProvider} from "antd";
4+
35
import router from "./router";
6+
import THEME_CONFIG from "./theme";
47

58
import "@ant-design/v5-patch-for-react-19";
69

@@ -11,7 +14,13 @@ import "@ant-design/v5-patch-for-react-19";
1114
* @return
1215
*/
1316
const AntApp = () => {
14-
return <RouterProvider router={router}/>;
17+
return (
18+
<ConfigProvider
19+
theme={THEME_CONFIG}
20+
>
21+
<RouterProvider router={router}/>
22+
</ConfigProvider>
23+
);
1524
};
1625

1726
export default AntApp;

components/log-viewer-webui/client/src/components/Layout/MainLayout.module.css

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,6 @@
1212
.siderLogo {
1313
max-width: 100%;
1414
max-height: 100%;
15-
height: 32px;
15+
padding-inline: 15%;
16+
padding-block: 16px;
1617
}

components/log-viewer-webui/client/src/components/Layout/MainLayout.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ const MainLayout = () => {
4040
collapsed={collapsed}
4141
collapsible={true}
4242
theme={"light"}
43-
width={"150"}
43+
width={150}
4444
onCollapse={(value) => {
4545
setCollapsed(value);
4646
}}
Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
import type {ThemeConfig} from "antd";
2+
3+
4+
/**
5+
* Ant Design theme configuration.
6+
*/
7+
const THEME_CONFIG: ThemeConfig = Object.freeze({
8+
token: {
9+
fontFamily: "'Inter', sans-serif",
10+
colorPrimary: "#2a8efa",
11+
borderRadius: 3,
12+
},
13+
cssVar: true,
14+
hashed: false,
15+
});
16+
17+
18+
export default THEME_CONFIG;

0 commit comments

Comments
 (0)