合并冲突
Change-Id: I3b6ac5ae87aad8fe746eceecc8f92fc5574b50a8
diff --git a/config/defaultSettings.ts b/config/defaultSettings.ts
index 2796a7e..97bac47 100644
--- a/config/defaultSettings.ts
+++ b/config/defaultSettings.ts
@@ -7,18 +7,19 @@
pwa?: boolean;
logo?: string;
} = {
- navTheme: 'light',
+ navTheme: 'realDark',
// 拂晓蓝
- colorPrimary: '#1890ff',
- layout: 'mix',
+ colorPrimary: '#13C2C2',
+ layout: 'top',
contentWidth: 'Fluid',
- fixedHeader: false,
+ fixedHeader: true,
fixSiderbar: true,
colorWeak: false,
- title: 'Ant Design Pro',
+ title: 'ThunderHub',
pwa: true,
- logo: 'https://gw.alipayobjects.com/zos/rmsportal/KDpgvguMpGfqaHPjicRK.svg',
+ logo: './logo.svg',
iconfontUrl: '',
+ splitMenus: false,
token: {
// 参见ts声明，demo 见文档，通过token 修改样式
//https://procomponents.ant.design/components/layout#%E9%80%9A%E8%BF%87-token-%E4%BF%AE%E6%94%B9%E6%A0%B7%E5%BC%8F