From ca5ae82f9e7ce67b374d7649e7bd27dd219ed25b Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: 星期六, 01 三月 2025 14:38:00 +0800
Subject: [PATCH] pagination更换成flex布局
---
src/assets/styles/ruoyi.scss | 72 ++++++++++++++++++++++-------------
1 files changed, 45 insertions(+), 27 deletions(-)
diff --git a/src/assets/styles/ruoyi.scss b/src/assets/styles/ruoyi.scss
index 1ccc73b..db9b1f6 100644
--- a/src/assets/styles/ruoyi.scss
+++ b/src/assets/styles/ruoyi.scss
@@ -1,4 +1,4 @@
- /**
+/**
* 閫氱敤css鏍峰紡甯冨眬澶勭悊
* Copyright (c) 2019 ruoyi
*/
@@ -37,7 +37,7 @@
.mb10 {
margin-bottom: 10px;
}
-.ml0 {
+.ml10 {
margin-left: 10px;
}
.mt20 {
@@ -49,7 +49,7 @@
.mb20 {
margin-bottom: 20px;
}
-.m20 {
+.ml20 {
margin-left: 20px;
}
@@ -60,12 +60,15 @@
color: inherit;
}
+.el-form .el-form-item__label {
+ font-weight: 700;
+}
.el-dialog:not(.is-fullscreen) {
margin-top: 6vh !important;
}
.el-dialog.scrollbar .el-dialog__body {
- overflow: auto;
+ overflow: auto;
overflow-x: hidden;
max-height: 70vh;
padding: 10px 20px 0;
@@ -99,34 +102,44 @@
/** 琛ㄦ牸甯冨眬 **/
.pagination-container {
- // position: relative;
- height: 25px;
- margin-bottom: 10px;
- margin-top: 15px;
- padding: 10px 20px !important;
+ display: flex;
+ justify-content: flex-end;
+ margin-top: 20px;
+ background-color: transparent !important;
+}
+
+/* 寮圭獥涓殑鍒嗛〉鍣� */
+.el-dialog .pagination-container {
+ position: static !important;
+ margin: 10px 0 0 0;
+ padding: 0 !important;
+
+ .el-pagination {
+ position: static;
+ }
+}
+
+/* 绉诲姩绔�傞厤 */
+@media (max-width: 768px) {
+ .pagination-container {
+ .el-pagination {
+ > .el-pagination__jump {
+ display: none !important;
+ }
+ > .el-pagination__sizes {
+ display: none !important;
+ }
+ }
+ }
}
/* tree border */
.tree-border {
margin-top: 5px;
- border: 1px solid #e5e6e7;
- background: #FFFFFF none;
+ border: 1px solid var(--el-border-color-light, #e5e6e7);
+ background: var(--el-bg-color, #FFFFFF) none;
border-radius:4px;
width: 100%;
-}
-
-.pagination-container .el-pagination {
- right: 0;
- 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--small {
@@ -268,7 +281,12 @@
background: #42b983!important;
}
+/* 琛ㄦ牸鍙充晶宸ュ叿鏍忔牱寮� */
.top-right-btn {
- position: absolute;
- right: 0;
+ margin-left: auto;
+}
+
+/* 鍒嗗壊闈㈡澘鏍峰紡 */
+.splitpanes.default-theme .splitpanes__pane {
+ background-color: var(--splitpanes-default-bg) !important;
}
--
Gitblit v1.9.3