From 107672419e484d7893ecf624d4af2101cc72d890 Mon Sep 17 00:00:00 2001
From: fungleo <web@fengcms.com>
Date: Tue, 04 Aug 2020 11:59:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'upstream/master'
---
ruoyi-ui/src/assets/styles/ruoyi.scss | 27 ++++++++++++++++++++++++++-
1 files changed, 26 insertions(+), 1 deletions(-)
diff --git a/ruoyi-ui/src/assets/styles/ruoyi.scss b/ruoyi-ui/src/assets/styles/ruoyi.scss
index 18dff3a..ffb04a3 100644
--- a/ruoyi-ui/src/assets/styles/ruoyi.scss
+++ b/ruoyi-ui/src/assets/styles/ruoyi.scss
@@ -142,7 +142,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;
@@ -198,4 +219,8 @@
opacity: .8;
color: #fff!important;
background: #42b983!important;
+}
+
+.top-right-btn {
+ float: right;
}
\ No newline at end of file
--
Gitblit v1.9.2