Merge branch 'feat_theme_g' of United_Software/k_online_ui into feat_theme

src/components/DateRange/src/DateRange.vue

@@ -460,7 +460,7 @@ const clearDaterangeObj = () => {
   justify-content: flex-end;
   align-items: center;
   height: 48px;
-  border-top: 1px solid var(--color-border);
+  border-top: 1px solid var(--border-color-2);
   margin-top: 5px;
   font-weight: 400;
   font-size: var(--font-size-3);

src/views/Booking/src/BookingView.vue

@@ -397,6 +397,7 @@ const SearchInput = () => {
         <el-input
           placeholder="Enter Booking/HBL/PO/Container/Carrier Booking No. "
           v-model="BookingSearch"
+          class="log_input"
         >
           <template #prefix>
             <span class="iconfont_icon">
@@ -538,4 +539,7 @@ const SearchInput = () => {
     width: 740px;
   }
 }
+:deep(.log_input .el-input__wrapper) {
+  box-shadow: 0 0 0 1px var(--color-select-border) inset;
+}
 </style>

src/views/Dashboard/src/components/DashFiters.vue

@@ -227,7 +227,10 @@ const DateRangeSearch = () => {
         <div class="filter_filter" style="margin-left: 4px">
           <div v-if="props.isContainer">
             <el-date-picker
-              :style="{ width: props.isRevenue ? '110px' : '120px', height: '40px' }"
+              :style="{
+                width: props.isRevenue ? '110px' : '120px',
+                height: '40px'
+              }"
               v-model="startDate"
               format="MMM-YYYY"
               type="month"
@@ -375,7 +378,6 @@ const DateRangeSearch = () => {
   height: 40px;
   display: flex;
   align-items: center;
-  border-color: var(--color-select-border);
 }
 :deep(
     .el-radio-button.is-active
@@ -385,18 +387,21 @@ const DateRangeSearch = () => {
   height: 40px;
   display: flex;
   align-items: center;
-  border-color: var(--color-select-border);
+  border: 1px solid var(--color-select-border);
 }
 :deep(.el-radio-button:first-child .el-radio-button__inner) {
   height: 40px;
   display: flex;
-  border-color: var(--color-select-border);
+  border: 1px solid var(--color-select-border);
   align-items: center;
 }
 :deep(.el-radio-button__inner) {
   display: flex;
   align-items: center;
   height: 40px;
-  border-color: var(--color-select-border);
+  border: 1px solid var(--color-select-border);
+}
+:deep(.el-input__wrapper) {
+  box-shadow: 0 0 0 1px var(--color-select-border) inset;
 }
 </style>

src/views/OperationLog/src/OperationLog.vue

@@ -174,7 +174,7 @@ const DateChange = (date: any) => {
     <div class="display">
       <div class="heaer_top">
         <div class="search tips_filter">
-          <el-input placeholder="Search user name" v-model="OperationSearch">
+          <el-input placeholder="Search user name" v-model="OperationSearch" class="log_input">
             <template #prefix>
               <span class="iconfont_icon">
                 <svg class="iconfont" aria-hidden="true">
@@ -275,13 +275,18 @@ const DateChange = (date: any) => {
 :deep(:where(.css-dev-only-do-not-override-19iuou).ant-picker-range) {
   width: 250px !important;
   height: 32px;
+  background-color: var(--color-mode) !important;
 }
 .tips_filter {
   margin-right: 8px;
+  height: 32px;
 }
 .dashboard {
   z-index: 2014;
   position: relative;
-  background-color: white;
+  background-color: var(--color-mode);
+}
+:deep(.log_input .el-input__wrapper) {
+  box-shadow: 0 0 0 1px var(--color-select-border) inset;
 }
 </style>

src/views/Tracking/src/TrackingView.vue

@@ -645,6 +645,7 @@ const SearchInput = () => {
         <el-input
           placeholder="Enter Booking/HBL/PO/Container/Carrier Booking No. "
           v-model="TrackingSearch"
+          class="log_input"
         >
           <template #prefix>
             <span class="iconfont_icon">
@@ -787,4 +788,7 @@ const SearchInput = () => {
     width: 740px;
   }
 }
+:deep(.log_input .el-input__wrapper) {
+  box-shadow: 0 0 0 1px var(--color-select-border) inset;
+}
 </style>