From 8b5acaf341fc6dafc3e0a85ecdbcc00a972ebff6 Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: Thu, 12 Jan 2023 11:44:49 +0800
Subject: [PATCH] 升级spring-cloud相关组件到最新版
---
ruoyi-ui/src/assets/styles/ruoyi.scss | 48 +++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 43 insertions(+), 5 deletions(-)
diff --git a/ruoyi-ui/src/assets/styles/ruoyi.scss b/ruoyi-ui/src/assets/styles/ruoyi.scss
index 55118fa..c664395 100644
--- a/ruoyi-ui/src/assets/styles/ruoyi.scss
+++ b/ruoyi-ui/src/assets/styles/ruoyi.scss
@@ -37,7 +37,7 @@
.mb10 {
margin-bottom: 10px;
}
-.ml0 {
+.ml10 {
margin-left: 10px;
}
.mt20 {
@@ -49,12 +49,30 @@
.mb20 {
margin-bottom: 20px;
}
-.m20 {
+.ml20 {
margin-left: 20px;
}
-.el-dialog:not(.is-fullscreen){
+.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-dialog:not(.is-fullscreen) {
margin-top: 6vh !important;
+}
+
+.el-dialog__wrapper.scrollbar .el-dialog .el-dialog__body {
+ overflow: auto;
+ overflow-x: hidden;
+ max-height: 70vh;
+ padding: 10px 20px 0;
}
.el-table {
@@ -105,10 +123,29 @@
position: absolute;
}
+@media ( max-width : 768px) {
+ .pagination-container .el-pagination > .el-pagination__jump {
+ display: none !important;
+ }
+ .pagination-container .el-pagination > .el-pagination__sizes {
+ display: none !important;
+ }
+}
+
.el-table .fixed-width .el-button--mini {
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, .el-icon-arrow-down {
+ font-size: 12px;
}
.el-tree-node__content > .el-checkbox {
@@ -216,9 +253,10 @@
}
.avatar-upload-preview {
- position: absolute;
+ position: relative;
top: 50%;
- transform: translate(50%, -50%);
+ left: 50%;
+ transform: translate(-50%, -50%);
width: 200px;
height: 200px;
border-radius: 50%;
--
Gitblit v1.9.3