From a9f8b23a7a1b55f8606e02a157486f91e7c14b77 Mon Sep 17 00:00:00 2001
From: whyour <imwhyour@gmail.com>
Date: Mon, 29 Nov 2021 23:02:42 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=86=85=E5=AE=B9=E5=8C=BA?=
 =?UTF-8?q?=E9=AB=98=E5=BA=A6=E5=92=8Clogo=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layouts/defaultProps.tsx |  1 -
 src/layouts/index.less       | 15 +++++++++++++--
 src/layouts/index.tsx        |  8 +++++++-
 src/pages/diff/index.less    |  1 +
 4 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/src/layouts/defaultProps.tsx b/src/layouts/defaultProps.tsx
index a0ad39d3..cbf36142 100644
--- a/src/layouts/defaultProps.tsx
+++ b/src/layouts/defaultProps.tsx
@@ -79,6 +79,5 @@ export default {
   fixSiderbar: true,
   contentWidth: 'Fixed',
   splitMenus: false,
-  logo: 'https://z3.ax1x.com/2021/11/18/I7MpAe.png',
   siderWidth: 180,
 } as any;
diff --git a/src/layouts/index.less b/src/layouts/index.less
index f7b81e5d..a0958241 100644
--- a/src/layouts/index.less
+++ b/src/layouts/index.less
@@ -152,8 +152,8 @@
 
 .ant-layout-content.ant-pro-basicLayout-content.ant-pro-basicLayout-has-header {
   margin-bottom: 0 !important;
-  min-height: calc(100vh - 66px);
-  min-height: calc(100vh - var(--vh-offset, 0px) - 66px);
+  min-height: calc(100vh - 72px);
+  min-height: calc(100vh - var(--vh-offset, 0px) - 72px);
 }
 
 .Resizer {
@@ -293,3 +293,14 @@
     color: #1890ff;
   }
 }
+
+.ant-pro-sider-logo {
+  padding: 16px 10px;
+  h1 {
+    margin-left: 5px;
+  }
+  img {
+    width: 32px;
+    border-radius: 52%;
+  }
+}
diff --git a/src/layouts/index.tsx b/src/layouts/index.tsx
index e69dbaf2..f76228e9 100644
--- a/src/layouts/index.tsx
+++ b/src/layouts/index.tsx
@@ -20,7 +20,7 @@ import './index.less';
 import vhCheck from 'vh-check';
 import { version, changeLogLink, changeLog } from '../version';
 import { useCtx, useTheme } from '@/utils/hooks';
-import { message, Badge, Modal, Avatar, Dropdown, Menu, Popover } from 'antd';
+import { message, Badge, Modal, Avatar, Dropdown, Menu, Image } from 'antd';
 // @ts-ignore
 import SockJS from 'sockjs-client';
 import * as Sentry from '@sentry/react';
@@ -232,6 +232,12 @@ export default function (props: any) {
       selectedKeys={[props.location.pathname]}
       loading={loading}
       ErrorBoundary={Sentry.ErrorBoundary}
+      logo={
+        <Image
+          preview={false}
+          src="https://z3.ax1x.com/2021/11/18/I7MpAe.png"
+        />
+      }
       title={
         <>
           <span style={{ fontSize: 16 }}>控制面板</span>
diff --git a/src/pages/diff/index.less b/src/pages/diff/index.less
index 41aeb935..9c6682b0 100644
--- a/src/pages/diff/index.less
+++ b/src/pages/diff/index.less
@@ -13,6 +13,7 @@
 }
 
 .diff-switch-file {
+  min-width: 768px;
   .ant-form-item {
     margin-bottom: 8px;
   }