From 91e232bb0b910f3670bdbccd65cc218d55e1eda9 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 06 十二月 2022 16:08:20 +0800
Subject: [PATCH] Merge branch 'develop'
---
src/pc/components/navbar/normal-navbar/index.scss | 34 ++++------------------------------
1 files changed, 4 insertions(+), 30 deletions(-)
diff --git a/src/pc/components/navbar/normal-navbar/index.scss b/src/pc/components/navbar/normal-navbar/index.scss
index ebd7439..ea0f488 100644
--- a/src/pc/components/navbar/normal-navbar/index.scss
+++ b/src/pc/components/navbar/normal-navbar/index.scss
@@ -9,7 +9,7 @@
background-repeat: no-repeat;
background-size: cover;
min-height: 50px;
- z-index: 2;
+ z-index: 3;
.navbar-wrap {
margin: 0 auto;
@@ -39,6 +39,9 @@
border: 0;
.ant-menu-item:hover, .ant-menu-item-active, .ant-menu:not(.ant-menu-inline) .ant-menu-submenu-open, .ant-menu-submenu-active, .ant-menu-submenu-title:hover {
color: unset;
+ }
+ .ant-menu-item span {
+ display: inline-block;
}
}
.ant-menu-horizontal > .ant-menu-item:hover, .ant-menu-horizontal > .ant-menu-submenu:hover, .ant-menu-horizontal > .ant-menu-item-active, .ant-menu-horizontal > .ant-menu-submenu-active, .ant-menu-horizontal > .ant-menu-item-open, .ant-menu-horizontal > .ant-menu-submenu-open, .ant-menu-horizontal > .ant-menu-item-selected, .ant-menu-horizontal > .ant-menu-submenu-selected {
@@ -95,34 +98,6 @@
right: -30px;
font-size: 16px;
}
- .model-menu-action-list {
- line-height: 40px;
- .ant-row > .anticon-plus {
- position: absolute;
- right: -30px;
- font-size: 16px;
- }
- }
- .card-add-button {
- text-align: right;
- clear: left;
- .anticon-plus {
- font-size: 20px;
- color: #26C281;
- padding: 5px;
- margin-right: 10px;
- }
- }
- .ant-pagination {
- float: right;
- margin: 10px;
- }
-
- .model-menu-action-list {
- .page-card {
- line-height: 55px;
- }
- }
}
.normal-navbar-edit-box::after {
display: block;
@@ -130,7 +105,6 @@
clear: both;
}
.normal-navbar-edit-box:hover {
- z-index: 1;
box-shadow: 0px 0px 4px #1890ff;
}
.top-menu-popover {
--
Gitblit v1.8.0