From 46db06a22b26e7e518397288d033f2c6b38bc04b Mon Sep 17 00:00:00 2001
From: 若依 <yzz_ivy@163.com>
Date: 星期五, 15 四月 2022 09:17:21 +0800
Subject: [PATCH] !465 update ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDictType.java. Merge pull request !465 from XCSDN/N/A
---
ruoyi-ui/src/assets/styles/ruoyi.scss | 45 +++++++++++++++++++++++++++++++++++++--------
1 files changed, 37 insertions(+), 8 deletions(-)
diff --git a/ruoyi-ui/src/assets/styles/ruoyi.scss b/ruoyi-ui/src/assets/styles/ruoyi.scss
index 96c95c1..e3912ce 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,26 @@
.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-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,11 +119,30 @@
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 {
- color: #409EFF;
padding-left: 0;
padding-right: 0;
width: inherit;
+}
+
+/** 表格更多操作下拉样式 */
+.el-table .el-dropdown-link {
+ cursor: pointer;
+ color: #409EFF;
+ margin-left: 5px;
+}
+
+.el-table .el-dropdown, .el-icon-arrow-down {
+ font-size: 12px;
}
.el-tree-node__content > .el-checkbox {
@@ -238,7 +271,3 @@
position: relative;
float: right;
}
-/* XY 代码生成预览左右滑动 */
-.el-tabs__content{
- overflow-x: scroll;
-}
\ No newline at end of file
--
Gitblit v1.9.2