From 1bec8d69cf14bd88591eee5b0320c5c8f6c25a08 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 08 三月 2024 21:19:31 +0800
Subject: [PATCH] Merge branch 'master' into positec
---
src/tabviews/custom/components/share/normalheader/index.scss | 15 +++++++++++++--
1 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/src/tabviews/custom/components/share/normalheader/index.scss b/src/tabviews/custom/components/share/normalheader/index.scss
index 3321603..8de5a23 100644
--- a/src/tabviews/custom/components/share/normalheader/index.scss
+++ b/src/tabviews/custom/components/share/normalheader/index.scss
@@ -5,18 +5,20 @@
border-bottom: 1px solid #e8e8e8;
overflow: hidden;
letter-spacing: 0px;
+ line-height: 45px;
+ box-sizing: content-box;
.title {
text-decoration: inherit;
font-weight: inherit;
font-style: inherit;
float: left;
- line-height: 45px;
+ line-height: inherit;
margin-left: 10px;
position: relative;
z-index: 1;
}
- .top-search {
+ .mk-search-wrap {
background: transparent;
text-decoration: unset;
font-weight: normal;
@@ -33,10 +35,19 @@
.ant-select-selection {
height: 28px;
}
+ .ant-input-search-button {
+ height: 28px;
+ }
}
}
}
}
+.normal-header:not(.header-search) {
+ .title {
+ display: block;
+ float: none;
+ }
+}
.header-search.normal-header {
display: flex;
}
--
Gitblit v1.8.0