From 88e29ed5854ed9e62b719e4804958206c5fd9db1 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期五, 22 十一月 2024 19:30:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/assets/styles/element-ui.scss |  117 +++++++++++++++++++++++++++++++++++++++++++++++++---------
 1 files changed, 98 insertions(+), 19 deletions(-)

diff --git a/src/assets/styles/element-ui.scss b/src/assets/styles/element-ui.scss
index c3102f4..3aa5514 100644
--- a/src/assets/styles/element-ui.scss
+++ b/src/assets/styles/element-ui.scss
@@ -1,4 +1,20 @@
-// cover some element-ui styles
+
+.el-collapse {
+  .collapse__title {
+    font-weight: 600;
+    padding: 0 8px;
+    font-size: 1.2em;
+    line-height: 1.1em;
+  }
+  .el-collapse-item__content {
+    padding: 0 8px;
+  }
+}
+
+.el-divider--horizontal {
+  margin-bottom: 10px;
+  margin-top: 10px;
+}
 
 .el-breadcrumb__inner,
 .el-breadcrumb__inner a {
@@ -6,7 +22,7 @@
 }
 
 .el-upload {
-  input[type="file"] {
+  input[type='file'] {
     display: none !important;
   }
 }
@@ -46,12 +62,37 @@
   }
 }
 
-// to fixed https://github.com/ElemeFE/element/issues/2461
-.el-dialog {
-  transform: none;
-  left: 0;
-  position: relative;
-  margin: 0 auto;
+/*-------------Dialog-------------**/
+.el-overlay {
+  overflow: hidden;
+
+  .el-overlay-dialog {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    width: 100%;
+    height: 100%;
+
+    .el-dialog {
+      margin: 0 auto !important;
+
+      .el-dialog__body {
+        padding: 15px !important;
+      }
+      .el-dialog__header {
+        padding: 16px 16px 8px 16px;
+        box-sizing: border-box;
+        border-bottom: 1px solid var(--brder-color);
+        margin-right: 0;
+      }
+    }
+  }
+}
+
+.el-dialog__body {
+  max-height: calc(90vh - 111px) !important;
+  overflow-y: auto;
+  overflow-x: hidden;
 }
 
 // refine element ui upload
@@ -69,7 +110,7 @@
 // dropdown
 .el-dropdown-menu {
   a {
-    display: block
+    display: block;
   }
 }
 
@@ -83,19 +124,57 @@
   box-sizing: content-box;
 }
 
-.el-menu--collapse
-  > div
-  > .el-submenu
-  > .el-submenu__title
-  .el-submenu__icon-arrow {
+.el-menu--collapse > div > .el-submenu > .el-submenu__title .el-submenu__icon-arrow {
   display: none;
 }
 
-
-.el-tabs--border-card > .el-tabs__content {
-  padding: 0;
+.el-dropdown .el-dropdown-link {
+  color: var(--el-color-primary) !important;
 }
-.search-bar .el-button {
-  height: 32px;
+
+/* 褰� el-form 鐨� inline 灞炴�т负 true 鏃� */
+/* 璁剧疆 label 鐨勫搴﹂粯璁や负 68px */
+.el-form--inline .el-form-item__label {
+  width: 68px;
+}
+
+/* 璁剧疆 el-select 鐨勫搴﹂粯璁や负 240px */
+.el-form--inline .el-select {
+  width: 240px;
+}
+
+/* 璁剧疆 el-input 鐨勫搴﹂粯璁や负 240px */
+.el-form--inline .el-input {
+  width: 240px;
+}
+
+// 寮圭獥鍏ㄥ眬鏍峰紡
+.el-dialog__header {
+  height: 55px;
+  line-height: 55px;
+  margin-bottom: 0px !important;
+  border-bottom: 1px solid #e6f2fd;
+  padding-top: 0 !important;
+  justify-content: space-between;
+}
+.el-dialog__header > :first-child {
+  flex: none !important;
+  border-bottom: 2px solid #0068ff;
+  color: #333333;
+}
+
+// 鍙充晶寮圭獥鍏ㄥ眬鏍峰紡
+.el-drawer__header {
+  height: 55px;
+  line-height: 55px;
+  margin-bottom: 0px !important;
+  border-bottom: 1px solid #e6f2fd;
+  padding-top: 0 !important;
+  justify-content: space-between;
+}
+.el-drawer__header > :first-child {
+  flex: none !important;
+  border-bottom: 2px solid #0068ff;
+  color: #333333;
 }
 

--
Gitblit v1.8.0