From 07c005cf28acf74e3afde82122e4c53e1000d70c Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 12 六月 2023 12:06:18 +0800
Subject: [PATCH] Merge branch 'master' into positec
---
src/tabviews/custom/components/share/normalheader/index.scss | 19 +++++++++++++++++--
1 files changed, 17 insertions(+), 2 deletions(-)
diff --git a/src/tabviews/custom/components/share/normalheader/index.scss b/src/tabviews/custom/components/share/normalheader/index.scss
index c58253d..8de5a23 100644
--- a/src/tabviews/custom/components/share/normalheader/index.scss
+++ b/src/tabviews/custom/components/share/normalheader/index.scss
@@ -5,23 +5,26 @@
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;
font-style: normal;
letter-spacing: 0px;
+ flex: 1;
>.ant-row {
>.ant-col {
height: 45px;
@@ -32,10 +35,22 @@
.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;
+}
.normal-header.hidden {
display: none;
}
\ No newline at end of file
--
Gitblit v1.8.0