From 25afde47960cc30c5c66bcee931b27e18449388b Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期四, 13 八月 2020 11:28:11 +0800
Subject: [PATCH] 同步升级3.1
---
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 ccddfff..0f308aa 100644
--- a/ruoyi-ui/src/assets/styles/ruoyi.scss
+++ b/ruoyi-ui/src/assets/styles/ruoyi.scss
@@ -53,16 +53,20 @@
margin-left: 20px;
}
-.el-dialog {
+.el-dialog:not(.is-fullscreen){
margin-top: 6vh !important;
}
-.el-table .el-table__header-wrapper th {
- word-break: break-word;
- background-color: #f8f8f9;
- color: #515a6e;
- height: 40px;
- font-size: 13px;
+.el-table {
+ .el-table__header-wrapper, .el-table__fixed-header-wrapper {
+ th {
+ word-break: break-word;
+ background-color: #f8f8f9;
+ color: #515a6e;
+ height: 40px;
+ font-size: 13px;
+ }
+ }
}
/** 琛ㄥ崟甯冨眬 **/
@@ -139,6 +143,27 @@
margin-bottom: 10px;
}
+/* button color */
+.el-button--cyan.is-active,
+.el-button--cyan:active {
+ background: #20B2AA;
+ border-color: #20B2AA;
+ color: #FFFFFF;
+}
+
+.el-button--cyan:focus,
+.el-button--cyan:hover {
+ background: #48D1CC;
+ border-color: #48D1CC;
+ color: #FFFFFF;
+}
+
+.el-button--cyan {
+ background-color: #20B2AA;
+ border-color: #20B2AA;
+ color: #FFFFFF;
+}
+
/* text color */
.text-navy {
color: #1ab394;
@@ -189,10 +214,14 @@
overflow: hidden;
}
-
/* 鎷栨嫿鍒楁牱寮� */
.sortable-ghost{
opacity: .8;
color: #fff!important;
background: #42b983!important;
}
+
+.top-right-btn {
+ position: relative;
+ float: right;
+}
\ No newline at end of file
--
Gitblit v1.9.3