From cb81eef3d9aabe280e506fc7971c539542cf13f7 Mon Sep 17 00:00:00 2001
From: liuyg <376836862@qq.com>
Date: Thu, 19 Aug 2021 15:12:01 +0800
Subject: [PATCH] 冲突
---
src/styles/element-ui.scss | 50 ++++++++++++++++++--------------------------------
1 files changed, 18 insertions(+), 32 deletions(-)
diff --git a/src/styles/element-ui.scss b/src/styles/element-ui.scss
index 099c829..48afb80 100644
--- a/src/styles/element-ui.scss
+++ b/src/styles/element-ui.scss
@@ -20,7 +20,7 @@
}
.el-menu--display,
-.el-menu--display + .el-submenu__icon-arrow {
+.el-menu--display+.el-submenu__icon-arrow {
display: none;
}
@@ -49,17 +49,17 @@
.el-dropdown-menu__item--divided:before,
.el-menu,
-.el-menu--horizontal > .el-menu-item:not(.is-disabled):focus,
-.el-menu--horizontal > .el-menu-item:not(.is-disabled):hover,
-.el-menu--horizontal > .el-submenu .el-submenu__title:hover {
+.el-menu--horizontal>.el-menu-item:not(.is-disabled):focus,
+.el-menu--horizontal>.el-menu-item:not(.is-disabled):hover,
+.el-menu--horizontal>.el-submenu .el-submenu__title:hover {
background-color: transparent;
}
.el-dropdown-menu__item--divided:before,
.el-menu,
-.el-menu--horizontal > .el-menu-item:not(.is-disabled):focus,
-.el-menu--horizontal > .el-menu-item:not(.is-disabled):hover,
-.el-menu--horizontal > .el-submenu .el-submenu__title:hover {
+.el-menu--horizontal>.el-menu-item:not(.is-disabled):focus,
+.el-menu--horizontal>.el-menu-item:not(.is-disabled):hover,
+.el-menu--horizontal>.el-submenu .el-submenu__title:hover {
background-color: transparent !important;
}
@@ -89,7 +89,6 @@
// box-shadow: none !important;
// height: 40px;
// }
-
// //取消顶部搜索栏
// .user .el-card.is-never-shadow.avue-crud__search {
// position: relative !important;
@@ -99,116 +98,93 @@
// box-shadow: none !important;
// height: auto;
// }
-
// .desk .el-card.is-never-shadow.avue-crud__search {
// width: calc(100% - 360px) !important;
// }
-
// .securityGuard .el-card.is-never-shadow.avue-crud__search {
// width: calc(100% - 300px) !important;
// left: 120px;
// }
-
// .securityUnit .el-card.is-never-shadow.avue-crud__search {
// left: 200px;
// width: calc(100% - 380px) !important;
// }
-
// .equipments .el-card.is-never-shadow.avue-crud__search {
// width: calc(100% - 380px) !important;
// left: 200px;
// }
-
// .dispatch .el-card.is-never-shadow.avue-crud__search {
// width: calc(100% - 380px) !important;
// left: 200px;
// }
-
// .dispatchChildoperable .el-card.is-never-shadow.avue-crud__search {
// width: calc(100% - 280px) !important;
// left: 90px;
// }
-
// .workreply .el-card.is-never-shadow.avue-crud__search {
// width: calc(100% - 380px) !important;
// left: 200px !important;
// }
-
// .recruitmentManagement .el-card.is-never-shadow.avue-crud__search {
// width: calc(100% - 380px) !important;
// left: 120px !important;
// }
-
// .hasButOne .el-card.is-never-shadow.avue-crud__search {
// width: calc(100% - 300px) !important;
// left: 120px !important;
// }
-
// .hasButTwo .el-card.is-never-shadow.avue-crud__search {
// width: calc(100% - 380px) !important;
// left: 200px !important;
// }
-
// .desk1 .el-card.is-never-shadow.avue-crud__search {
// width: calc(100% - 410px) !important;
// left: 200px !important;
// }
-
// .topmenu .el-card.is-never-shadow.avue-crud__search {
// width: calc(100% - 390px) !important;
// left: 220px !important;
// }
-
// .hasButThree .el-card.is-never-shadow.avue-crud__search {
// width: calc(100% - 510px) !important;
// left: 310px !important;
// }
-
// .morpheus-box .el-card.is-never-shadow.avue-crud__search {
// width: calc(100% - 590px) !important;
// left: 420px !important;
// }
-
// .morpheus-box-exam .el-card.is-never-shadow.avue-crud__search {
// width: calc(100% - 390px) !important;
// left: 20px !important;
// }
-
// .morpheus-box-paper .el-card.is-never-shadow.avue-crud__search {
// width: calc(100% - 390px) !important;
// left: 220px !important;
// }
-
// .morpheus-box-score .el-card.is-never-shadow.avue-crud__search {
// width: calc(100% - 390px) !important;
// left: 150px !important;
// }
-
// .morpheus-box-apply-exam .el-card.is-never-shadow.avue-crud__search {
// width: calc(100% - 390px) !important;
// left: 120px !important;
// }
-
// .desk .el-card.is-never-shadow.avue-crud__search {
// width: calc(100% - 390px) !important;
// left: 280px !important;
// }
-
// .morpheus-box-apply-exam-1 .el-card.is-never-shadow.avue-crud__search {
// width: calc(100% - 390px) !important;
// left: 220px !important;
// }
-
// .avue-form {
// position: relative;
// top: -10px;
// }
-
// //顶部按钮栏
// .avue-crud__menu {
// height: 60px;
// }
-
// //顶部按钮
// .avue-crud .avue-crud__left .el-button,
// .avue-crud .avue-crud__right .el-button,
@@ -225,6 +201,7 @@
.avue-form__menu--center .el-button {
float: left;
}
+
.avue-form__menu--center .el-button:nth-child(1) {
margin-left: 30px;
}
@@ -262,8 +239,17 @@
}
//top 导航 按钮
-.el-menu--horizontal > .el-menu-item.is-active,
+.el-menu--horizontal>.el-menu-item.is-active,
.avue-top,
.el-dropdown {
color: #fff !important;
}
+
+.securityPapers {
+ width: 100%;
+ height: 100%;
+ background-color: #f4f6f8;
+ position: absolute;
+ top: 40px;
+ left: 0;
+}
\ No newline at end of file
--
Gitblit v1.9.3