Merge branch 'dev' of https://git.mesalab.cn/cyber-narrator/cn-ui into dev22.01-rc1

2 files changed, 8 insertions, 2 deletions

diff --git a/src/assets/css/common/table-common.scss b/src/assets/css/common/table-common.scss
index 5da50aef..ed0e4edf 100644
--- a/src/assets/css/common/table-common.scss
+++ b/src/assets/css/common/table-common.scss
@@ -46,6 +46,11 @@
       border: 1px solid #E6EAED;
 
     }
+    .top-tool-search.margin-r-20 {
+     .top-tool-btn {
+       border-left: none;
+     }
+    }
 
     .top-tool-right {
       display: flex;
@@ -68,7 +73,7 @@
       }
     }
     .top-tool-btn {
-      height: 32px;
+      height: 33px;
       width: 36px;
       border: 1px solid $--border-color-primary;
       outline: none;
@@ -81,6 +86,7 @@
         color: $--button-gray-color;
       }
     }
+
     .top-tool-btn.top-tool-btn--text {
       padding: 0 8px;
       width: unset;
diff --git a/src/assets/css/components/components/table/common.scss b/src/assets/css/components/components/table/common.scss
index b18e9ff9..e0cc9b1f 100644
--- a/src/assets/css/components/components/table/common.scss
+++ b/src/assets/css/components/components/table/common.scss
@@ -66,7 +66,7 @@
 }
 
 .list-page .top-tools .top-tool-btn {
-  height: 32.5px;
+  height: 33px;
   width: 36px;
   border: 1px solid #DEDEDE;
   outline: none;