From b0c2ca5393b3c44c31a0f21557d6a002d4fb6a2d Mon Sep 17 00:00:00 2001
From: invalid w <wangjuesix@gmail.com>
Date: Wed, 13 Sep 2023 20:26:16 +0800
Subject: [PATCH] =?UTF-8?q?fix(Header):=20=E9=A1=B6=E9=83=A8=E8=8F=9C?=
 =?UTF-8?q?=E5=8D=95=E6=B7=B7=E5=90=88=E6=A8=A1=E5=BC=8F=E4=B8=8B=EF=BC=8C?=
 =?UTF-8?q?=E5=A4=B4=E9=83=A8=E5=AF=BC=E8=88=AA=E6=A0=8F=E6=A0=B7=E5=BC=8F?=
 =?UTF-8?q?=E9=94=99=E4=BD=8D=20#3021=20(#3024)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* fix(Header): 顶部菜单混合模式下，头部导航栏样式错位 #3021

antdv4的ant-layout-header css会携带父选择器 导致line-height失效

* chore: 移除无用css
---
 src/layouts/default/header/index.less | 2 +-
 src/layouts/default/header/index.vue  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/layouts/default/header/index.less b/src/layouts/default/header/index.less
index 2ce7bdf17..869e12603 100644
--- a/src/layouts/default/header/index.less
+++ b/src/layouts/default/header/index.less
@@ -3,7 +3,7 @@
 @breadcrumb-prefix-cls: ~'@{namespace}-layout-breadcrumb';
 @logo-prefix-cls: ~'@{namespace}-app-logo';
 
-.@{header-prefix-cls} {
+.ant-layout .@{header-prefix-cls} {
   display: flex;
   align-items: center;
   justify-content: space-between;
diff --git a/src/layouts/default/header/index.vue b/src/layouts/default/header/index.vue
index c2bf2c78d..2ffd43c23 100644
--- a/src/layouts/default/header/index.vue
+++ b/src/layouts/default/header/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <Layout.Header :class="getHeaderClass" style="height: auto; padding-inline: 0">
+  <Layout.Header :class="getHeaderClass">
     <!-- left start -->
     <div :class="`${prefixCls}-left`">
       <!-- logo -->