From 60bc7643d20c80740711dd1de1cff37c01222d3d Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 18 七月 2023 15:22:31 +0800
Subject: [PATCH] 2023-07-18
---
src/assets/css/viewstyle.scss | 38 +++++++++++++++++++-------------------
src/tabviews/zshare/topSearch/index.scss | 4 ++--
src/assets/css/main.scss | 8 ++++----
3 files changed, 25 insertions(+), 25 deletions(-)
diff --git a/src/assets/css/main.scss b/src/assets/css/main.scss
index 8dfb4c9..21ebdd8 100644
--- a/src/assets/css/main.scss
+++ b/src/assets/css/main.scss
@@ -298,8 +298,8 @@
}
.ant-modal-footer {
.ant-btn:not(.ant-btn-primary):active, .ant-btn:not(.ant-btn-primary).active, .ant-btn:not(.ant-btn-primary):hover, .ant-btn:not(.ant-btn-primary):focus {
- color: var(--mk-sys-color7);
- border-color: var(--mk-sys-color7);
+ color: var(--mk-sys-color);
+ border-color: var(--mk-sys-color);
}
}
}
@@ -334,8 +334,8 @@
.ant-modal-footer {
.ant-btn:not(.ant-btn-primary):active, .ant-btn:not(.ant-btn-primary).active, .ant-btn:not(.ant-btn-primary):hover, .ant-btn:not(.ant-btn-primary):focus {
- color: var(--mk-sys-color7);
- border-color: var(--mk-sys-color7);
+ color: var(--mk-sys-color);
+ border-color: var(--mk-sys-color);
}
.ant-btn-primary {
background-color: var(--mk-sys-color);
diff --git a/src/assets/css/viewstyle.scss b/src/assets/css/viewstyle.scss
index 89d0402..94f61a3 100644
--- a/src/assets/css/viewstyle.scss
+++ b/src/assets/css/viewstyle.scss
@@ -8,7 +8,7 @@
// color8 8闃惰壊
// color9 9闃惰壊
// color10 10闃惰壊
-@mixin viewstyle($color1, $color2, $color3, $color4, $color5, $color6, $color7) {
+@mixin viewstyle($color1, $color2, $color3, $color4, $color5, $color6) {
.custom-data-card-box, .custom-prop-card-box {
.data-zoom.radio.active, .data-zoom.checkbox.active {
.mk-card:not(.active):not(.selected):hover {
@@ -106,8 +106,8 @@
.ant-modal-confirm-confirm {
.ant-modal-confirm-btns {
.ant-btn:not(.ant-btn-primary):active, .ant-btn:not(.ant-btn-primary).active, .ant-btn:not(.ant-btn-primary):hover, .ant-btn:not(.ant-btn-primary):focus {
- color: $color7;
- border-color: $color7;
+ color: $color6;
+ border-color: $color6;
}
.ant-btn-primary {
background-color: $color6;
@@ -123,7 +123,7 @@
background-color: $color6;
}
.ant-tabs-nav .ant-tabs-tab:active {
- color: $color7;
+ color: $color6;
}
.ant-tabs-nav .ant-tabs-tab:hover {
color: $color5;
@@ -310,7 +310,7 @@
--mk-sys-color3: #91d5ff;
--mk-sys-color4: #69c0ff;
--mk-sys-color5: #40a9ff;
- @include viewstyle(#e6f7ff, #bae7ff, #91d5ff, #69c0ff, #40a9ff, #1890ff, #096dd9);
+ @include viewstyle(#e6f7ff, #bae7ff, #91d5ff, #69c0ff, #40a9ff, #1890ff);
}
body[class*='mk-red-'] {
@@ -320,7 +320,7 @@
--mk-sys-color3: #ffa39e;
--mk-sys-color4: #ff7875;
--mk-sys-color5: #ff4d4f;
- @include viewstyle(#fff1f0, #ffccc7, #ffa39e, #ff7875, #ff4d4f, #f5222d, #cf1322);
+ @include viewstyle(#fff1f0, #ffccc7, #ffa39e, #ff7875, #ff4d4f, #f5222d);
}
body[class*='mk-orange-red-'] {
@@ -330,7 +330,7 @@
--mk-sys-color3: #ffbb96;
--mk-sys-color4: #ff9c6e;
--mk-sys-color5: #ff7a45;
- @include viewstyle(#fff2e8, #ffd8bf, #ffbb96, #ff9c6e, #ff7a45, #fa541c, #d4380d);
+ @include viewstyle(#fff2e8, #ffd8bf, #ffbb96, #ff9c6e, #ff7a45, #fa541c);
}
body[class*='mk-orange-'] {
@@ -340,7 +340,7 @@
--mk-sys-color3: #ffd591;
--mk-sys-color4: #ffc069;
--mk-sys-color5: #ffa940;
- @include viewstyle(#fff7e6, #ffe7ba, #ffd591, #ffc069, #ffa940, #fa8c16, #d46b08);
+ @include viewstyle(#fff7e6, #ffe7ba, #ffd591, #ffc069, #ffa940, #fa8c16);
}
body[class*='mk-orange-yellow-'] {
@@ -350,7 +350,7 @@
--mk-sys-color3: #ffe58f;
--mk-sys-color4: #ffd666;
--mk-sys-color5: #ffc53d;
- @include viewstyle(#fffbe6, #fff1b8, #ffe58f, #ffd666, #ffc53d, #faad14, #d48806);
+ @include viewstyle(#fffbe6, #fff1b8, #ffe58f, #ffd666, #ffc53d, #faad14);
}
body[class*='mk-yellow-'] {
@@ -360,7 +360,7 @@
--mk-sys-color3: #fffb8f;
--mk-sys-color4: #fff566;
--mk-sys-color5: #ffec3d;
- @include viewstyle(#feffe6, #ffffb8, #fffb8f, #fff566, #ffec3d, #fadb14, #d4b106);
+ @include viewstyle(#feffe6, #ffffb8, #fffb8f, #fff566, #ffec3d, #fadb14);
}
body[class*='mk-yellow-green-'] {
@@ -370,7 +370,7 @@
--mk-sys-color3: #eaff8f;
--mk-sys-color4: #d3f261;
--mk-sys-color5: #bae637;
- @include viewstyle(#fcffe6, #f4ffb8, #eaff8f, #d3f261, #bae637, #a0d911, #7cb305);
+ @include viewstyle(#fcffe6, #f4ffb8, #eaff8f, #d3f261, #bae637, #a0d911);
}
body[class*='mk-green-'] {
@@ -380,7 +380,7 @@
--mk-sys-color3: #b7eb8f;
--mk-sys-color4: #95de64;
--mk-sys-color5: #73d13d;
- @include viewstyle(#f6ffed, #d9f7be, #b7eb8f, #95de64, #73d13d, #52c41a, #389e0d);
+ @include viewstyle(#f6ffed, #d9f7be, #b7eb8f, #95de64, #73d13d, #52c41a);
}
body[class*='mk-cyan-'] {
@@ -390,7 +390,7 @@
--mk-sys-color3: #87e8de;
--mk-sys-color4: #5cdbd3;
--mk-sys-color5: #36cfc9;
- @include viewstyle(#e6fffb, #b5f5ec, #87e8de, #5cdbd3, #36cfc9, #13c2c2, #08979c);
+ @include viewstyle(#e6fffb, #b5f5ec, #87e8de, #5cdbd3, #36cfc9, #13c2c2);
}
body[class*='mk-blue-purple-'] {
@@ -400,7 +400,7 @@
--mk-sys-color3: #adc6ff;
--mk-sys-color4: #85a5ff;
--mk-sys-color5: #597ef7;
- @include viewstyle(#f0f5ff, #d6e4ff, #adc6ff, #85a5ff, #597ef7, #2f54eb, #1d39c4);
+ @include viewstyle(#f0f5ff, #d6e4ff, #adc6ff, #85a5ff, #597ef7, #2f54eb);
}
body[class*='mk-purple-'] {
@@ -410,7 +410,7 @@
--mk-sys-color3: #d3adf7;
--mk-sys-color4: #b37feb;
--mk-sys-color5: #9254de;
- @include viewstyle(#f9f0ff, #efdbff, #d3adf7, #b37feb, #9254de, #722ed1, #531dab);
+ @include viewstyle(#f9f0ff, #efdbff, #d3adf7, #b37feb, #9254de, #722ed1);
}
body[class*='mk-magenta-'] {
@@ -420,7 +420,7 @@
--mk-sys-color3: #ffadd2;
--mk-sys-color4: #ff85c0;
--mk-sys-color5: #f759ab;
- @include viewstyle(#fff0f6, #ffd6e7, #ffadd2, #ff85c0, #f759ab, #eb2f96, #c41d7f);
+ @include viewstyle(#fff0f6, #ffd6e7, #ffadd2, #ff85c0, #f759ab, #eb2f96);
}
body[class*='mk-grass-green-'] {
@@ -430,7 +430,7 @@
--mk-sys-color3: #d9d26c;
--mk-sys-color4: #ccc845;
--mk-sys-color5: #bfbf22;
- @include viewstyle(#f2efda, #e6de97, #d9d26c, #ccc845, #bfbf22, #aeb303, #838c00);
+ @include viewstyle(#f2efda, #e6de97, #d9d26c, #ccc845, #bfbf22, #aeb303);
}
body[class*='mk-deep-red-'] {
@@ -440,7 +440,7 @@
--mk-sys-color3: #e89b9e;
--mk-sys-color4: #db7077;
--mk-sys-color5: #cf4856;
- @include viewstyle(#fff0f0, #f5cbcb, #e89b9e, #db7077, #cf4856, #c32539, #9c162c);
+ @include viewstyle(#fff0f0, #f5cbcb, #e89b9e, #db7077, #cf4856, #c32539);
}
body[class*='mk-deep-blue-'] {
@@ -450,5 +450,5 @@
--mk-sys-color3: #dbdfe6;
--mk-sys-color4: #c6cede;
--mk-sys-color5: #394c6f;
- @include viewstyle(#eff1f4, #e0e3e9, #dbdfe6, #c6cede, #394c6f, #1d3661, #1d3661);
+ @include viewstyle(#eff1f4, #e0e3e9, #dbdfe6, #c6cede, #394c6f, #1d3661);
}
\ No newline at end of file
diff --git a/src/tabviews/zshare/topSearch/index.scss b/src/tabviews/zshare/topSearch/index.scss
index e7cb88c..49746f8 100644
--- a/src/tabviews/zshare/topSearch/index.scss
+++ b/src/tabviews/zshare/topSearch/index.scss
@@ -65,8 +65,8 @@
}
}
.ant-btn:not(.ant-btn-primary):not(.ant-btn-link):active, .ant-btn:not(.ant-btn-primary):not(.ant-btn-link).active, .ant-btn:not(.ant-btn-primary):not(.ant-btn-link):hover, .ant-btn:not(.ant-btn-primary):not(.ant-btn-link):focus {
- color: var(--mk-sys-color7);
- border-color: var(--mk-sys-color7);
+ color: var(--mk-sys-color);
+ border-color: var(--mk-sys-color);
}
.ant-btn-primary {
background-color: var(--mk-sys-color);
--
Gitblit v1.8.0