resolve conflict

assets/scss/common/button.scss

@@ -92,10 +92,13 @@
       background: map-deep-get($config, #{$theme}, "basic-button-background");
     }
 
-    .search-button {
-      color: map-deep-get($config, #{$theme}, "search-btn-color");
+    .searchFilter{
+      .search-button {
+        height: 40px;
+        color: map-deep-get($config, #{$theme}, "search-btn-color");
+      }
     }
-
+     
     .v-dialog {
       .ant-btn-icon-only {
         color: map-deep-get(
@@ -135,6 +138,15 @@
           background: map-deep-get($config, #{$theme}, "ant-btn-danger-bg") !important;
         }
       }
+
+      &.expand-btn {
+        .v-icon {
+          color: map-deep-get($config, #{$theme}, "basic-button-color");
+          svg {
+            fill: map-deep-get($config, #{$theme}, "basic-button-color");
+          }
+        }
+      }
     }
   }
 }
@@ -161,4 +173,13 @@
     height: 16px;
     background:none;
   }
-}
+}
+.ant-btn  {
+  &.expand-btn {
+    .v-icon {
+      span {
+        margin-right: 8px;
+      }
+    }
+  }
+}

assets/scss/common/grid.scss

@@ -98,6 +98,17 @@
   @include theme($theme);
 
   .v-application.#{$theme}-mode {
+    .grid-title {
+      font-weight: 600;
+      font-size: 16px;
+      line-height: 24px;
+      letter-spacing: 0;
+      color: map-deep-get($config,
+        #{$theme},
+        "tui-grid-title-color"
+      );
+    }
+    
     .tui-grid {
       &-table {
         border: 1px solid;