From 0b89c49a1e3ab87368b689d985e28a977a9bb84e Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期五, 22 三月 2024 13:08:20 +0800
Subject: [PATCH] 合并冲突
---
src/components/tool/value-table.vue | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/src/components/tool/value-table.vue b/src/components/tool/value-table.vue
index c8bce0f..7808696 100644
--- a/src/components/tool/value-table.vue
+++ b/src/components/tool/value-table.vue
@@ -36,30 +36,30 @@
}
</style>
<style>
- .value-table .highlight-warning-row-border td {
+ /* .value-table .highlight-warning-row-border td {
border-top: 2px solid #ffcd29;
border-bottom: 2px solid #ffcd29;
- }
+ } */
.value-table .highlight-warning-row-border td:first-child {
- border-left: 2px solid #ffcd29;
+ border-left: 4px solid #ffcd29;
}
.value-table .highlight-warning-row-border td:last-child {
- border-right: 2px solid #ffcd29;
+ border-right: 4px solid #ffcd29;
}
- .value-table .highlight-danger-row-border td {
+ /* .value-table .highlight-danger-row-border td {
border-top: 2px solid red;
border-bottom: 2px solid red;
- }
+ } */
.value-table .highlight-danger-row-border td:first-child {
- border-left: 2px solid red;
+ border-left: 4px solid red;
}
.value-table .highlight-danger-row-border td:last-child {
- border-right: 2px solid red;
+ border-right: 4px solid red;
}
.value-table .el-upload {
--
Gitblit v1.9.3