From 2a7342ec437b86bf95fb6ec2af6bc082d8455b3d Mon Sep 17 00:00:00 2001
From: 若依 <yzz_ivy@163.com>
Date: 星期二, 30 三月 2021 15:23:04 +0800
Subject: [PATCH] !195 读取excel增加非空判断 Merge pull request !195 from 叫我宏锅锅/yuhong
---
ruoyi-ui/src/assets/styles/ruoyi.scss | 47 +++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 43 insertions(+), 4 deletions(-)
diff --git a/ruoyi-ui/src/assets/styles/ruoyi.scss b/ruoyi-ui/src/assets/styles/ruoyi.scss
index 18dff3a..c375277 100644
--- a/ruoyi-ui/src/assets/styles/ruoyi.scss
+++ b/ruoyi-ui/src/assets/styles/ruoyi.scss
@@ -67,6 +67,11 @@
font-size: 13px;
}
}
+ .el-table__body-wrapper {
+ .el-button [class*="el-icon-"] + span {
+ margin-left: 1px;
+ }
+ }
}
/** 表单布局 **/
@@ -85,6 +90,14 @@
margin-bottom: 10px;
margin-top: 15px;
padding: 10px 20px !important;
+}
+
+/* tree border */
+.tree-border {
+ margin-top: 5px;
+ border: 1px solid #e5e6e7;
+ background: #FFFFFF none;
+ border-radius:4px;
}
.pagination-container .el-pagination {
@@ -142,7 +155,28 @@
padding-left: 15px;
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;
@@ -186,8 +220,8 @@
position: absolute;
top: 50%;
transform: translate(50%, -50%);
- width: 180px;
- height: 180px;
+ width: 200px;
+ height: 200px;
border-radius: 50%;
box-shadow: 0 0 4px #ccc;
overflow: hidden;
@@ -198,4 +232,9 @@
opacity: .8;
color: #fff!important;
background: #42b983!important;
-}
\ No newline at end of file
+}
+
+.top-right-btn {
+ position: relative;
+ float: right;
+}
--
Gitblit v1.9.2