From 87e3d52c62233ad44bd7bac3f43e5348a2de4e94 Mon Sep 17 00:00:00 2001
From: luohairen <3399054449@qq.com>
Date: 星期一, 25 十一月 2024 10:36:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/assets/styles/ruoyi.scss | 114 +++++++++++++++++++++++++++++---------------------------
1 files changed, 59 insertions(+), 55 deletions(-)
diff --git a/src/assets/styles/ruoyi.scss b/src/assets/styles/ruoyi.scss
index 4e29874..3a16ea5 100644
--- a/src/assets/styles/ruoyi.scss
+++ b/src/assets/styles/ruoyi.scss
@@ -1,106 +1,108 @@
/**
-* 閫氱敤css鏍峰紡甯冨眬澶勭悊
-* Copyright (c) 2019 ruoyi
-*/
+ * 閫氱敤css鏍峰紡甯冨眬澶勭悊
+ * Copyright (c) 2019 ruoyi
+ */
/** 鍩虹閫氱敤 **/
.pt5 {
padding-top: 5px;
}
-
.pr5 {
padding-right: 5px;
}
-
.pb5 {
padding-bottom: 5px;
}
-
.mt5 {
margin-top: 5px;
}
-
.mr5 {
margin-right: 5px;
}
-
.mb5 {
margin-bottom: 5px;
}
-
.mb8 {
margin-bottom: 8px;
}
-
.ml5 {
margin-left: 5px;
}
-
.mt10 {
margin-top: 10px;
}
-
.mr10 {
margin-right: 10px;
}
-
.mb10 {
margin-bottom: 10px;
}
.ml10 {
- margin-left: 10px;
+ margin-left: 10px;
}
-
.mt20 {
margin-top: 20px;
}
-
.mr20 {
margin-right: 20px;
}
-
.mb20 {
margin-bottom: 20px;
}
.ml20 {
- margin-left: 20px;
+ margin-left: 20px;
}
-.h1, .h2, .h3, .h4, .h5, .h6, h1, h2, h3, h4, h5, h6 {
+.h1,
+.h2,
+.h3,
+.h4,
+.h5,
+.h6,
+h1,
+h2,
+h3,
+h4,
+h5,
+h6 {
font-family: inherit;
font-weight: 500;
line-height: 1.1;
color: inherit;
}
-.el-message-box__status + .el-message-box__message{
- word-break: break-word;
+.el-form .el-form-item__label {
+ font-size: 12px;
+ font-weight: 400;
+ color: #454B5E;
}
-
.el-dialog:not(.is-fullscreen) {
margin-top: 6vh !important;
}
-.el-dialog__wrapper.scrollbar .el-dialog .el-dialog__body {
+.el-dialog.scrollbar .el-dialog__body {
overflow: auto;
overflow-x: hidden;
max-height: 70vh;
padding: 10px 20px 0;
+ .el-form .el-form-item__label{
+ color: red;
+ }
}
.el-table {
- .el-table__header-wrapper, .el-table__fixed-header-wrapper {
+ .el-table__header-wrapper,
+ .el-table__fixed-header-wrapper {
th {
word-break: break-word;
- background-color: #f8f8f9;
+ background-color: #f8f8f9 !important;
color: #515a6e;
- height: 40px;
+ height: 40px !important;
font-size: 13px;
}
}
-
.el-table__body-wrapper {
- .el-button [class*="el-icon-"] + span {
+ .el-button [class*='el-icon-'] + span {
margin-left: 1px;
}
}
@@ -112,12 +114,12 @@
color: #6379bb;
border-bottom: 1px solid #ddd;
margin: 8px 10px 25px 10px;
- padding-bottom: 5px
+ padding-bottom: 5px;
}
/** 琛ㄦ牸甯冨眬 **/
.pagination-container {
- position: relative;
+ // position: relative;
height: 25px;
margin-bottom: 10px;
margin-top: 15px;
@@ -128,13 +130,14 @@
.tree-border {
margin-top: 5px;
border: 1px solid #e5e6e7;
- background: #FFFFFF none;
+ background: #ffffff none;
border-radius: 4px;
+ width: 100%;
}
.pagination-container .el-pagination {
- right: 0;
- position: absolute;
+ //right: 0;
+ //position: absolute;
}
@media (max-width: 768px) {
@@ -146,19 +149,21 @@
}
}
-.el-table .fixed-width .el-button--mini {
+.el-table .fixed-width .el-button--small {
padding-left: 0;
padding-right: 0;
width: inherit;
}
/** 琛ㄦ牸鏇村鎿嶄綔涓嬫媺鏍峰紡 */
-.el-table .el-dropdown-link,.el-table .el-dropdown-selfdefine {
- cursor: pointer;
- margin-left: 5px;
+.el-table .el-dropdown-link {
+ cursor: pointer;
+ color: #409eff;
+ margin-left: 10px;
}
-.el-table .el-dropdown, .el-icon-arrow-down {
+.el-table .el-dropdown,
+.el-icon-arrow-down {
font-size: 12px;
}
@@ -192,12 +197,12 @@
}
.el-card__header {
- padding: 14px 15px 7px;
+ padding: 14px 15px 7px !important;
min-height: 40px;
}
.el-card__body {
- padding: 15px 20px 20px 20px;
+ padding: 15px 20px 20px 20px !important;
}
.card-box {
@@ -209,22 +214,22 @@
/* button color */
.el-button--cyan.is-active,
.el-button--cyan:active {
- background: #20B2AA;
- border-color: #20B2AA;
- color: #FFFFFF;
+ background: #20b2aa;
+ border-color: #20b2aa;
+ color: #ffffff;
}
.el-button--cyan:focus,
.el-button--cyan:hover {
- background: #48D1CC;
- border-color: #48D1CC;
- color: #FFFFFF;
+ background: #48d1cc;
+ border-color: #48d1cc;
+ color: #ffffff;
}
.el-button--cyan {
- background-color: #20B2AA;
- border-color: #20B2AA;
- color: #FFFFFF;
+ background-color: #20b2aa;
+ border-color: #20b2aa;
+ color: #ffffff;
}
/* text color */
@@ -267,10 +272,9 @@
}
.avatar-upload-preview {
- position: relative;
+ position: absolute;
top: 50%;
- left: 50%;
- transform: translate(-50%, -50%);
+ transform: translate(50%, -50%);
width: 200px;
height: 200px;
border-radius: 50%;
@@ -280,12 +284,12 @@
/* 鎷栨嫿鍒楁牱寮� */
.sortable-ghost {
- opacity: .8;
+ opacity: 0.8;
color: #fff !important;
background: #42b983 !important;
}
+/* 琛ㄦ牸鍙充晶宸ュ叿鏍忔牱寮� */
.top-right-btn {
- position: relative;
- float: right;
+ margin-left: auto;
}
--
Gitblit v1.8.0