From 0245e64a9dff794903e546c3bdf9fef7efeefdf1 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 06 十二月 2022 16:09:04 +0800
Subject: [PATCH] Merge branch 'master' into positec

---
 src/tabviews/custom/components/table/edit-table/normalTable/index.scss |   15 +++------------
 1 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/src/tabviews/custom/components/table/edit-table/normalTable/index.scss b/src/tabviews/custom/components/table/edit-table/normalTable/index.scss
index 0fa9c9f..971228d 100644
--- a/src/tabviews/custom/components/table/edit-table/normalTable/index.scss
+++ b/src/tabviews/custom/components/table/edit-table/normalTable/index.scss
@@ -74,15 +74,6 @@
         .card-cell-list {
           color: rgba(0, 0, 0, 0.85);
         }
-        .ant-mk-picture {
-          position: relative;
-          background-position: center center;
-          background-size: cover;
-          margin: 2px;
-        }
-        .ant-mk-picture.scale {
-          cursor: zoom-in;
-        }
         .action-col {
           .ant-btn > .anticon + span {
             margin-left: 3px;
@@ -156,7 +147,7 @@
       left: 0px;
       right: 0px;
       bottom: 0px;
-      border: 1px solid var(--antd-wave-shadow-color);
+      border: 1px solid var(--mk-sys-color);
       height: auto;
       border-radius: 0;
       box-shadow: none!important;
@@ -196,7 +187,7 @@
         left: 0px;
         right: 0px;
         bottom: 0px;
-        border: 1px solid var(--antd-wave-shadow-color);
+        border: 1px solid var(--mk-sys-color);
       }
     }
     .anticon-exclamation-circle {
@@ -310,7 +301,7 @@
       font-size: var(--mk-table-font-size)!important;
       font-weight: var(--mk-table-font-weight)!important;
 
-      >span, div:not(.card-cell-list), div:not(.card-cell-list) div, div:not(.card-cell-list) span {
+      >span, >div:not(.card-cell-list) div, >div:not(.card-cell-list) span {
         font-weight: var(--mk-table-font-weight)!important;
       }
     }

--
Gitblit v1.8.0