Resolve merge conflict in Product.scss

src/Styles/Product/Product.scss

@@ -1,16 +1,9 @@
 .cropUploadFieldSmall {
-  :where(.css-dev-only-do-not-override-1v5z42l).ant-upload-wrapper.ant-upload-picture-card-wrapper
+
-    .ant-upload-list.ant-upload-list-picture-card
+  :where(.css-dev-only-do-not-override-1v5z42l).ant-upload-wrapper.ant-upload-picture-card-wrapper .ant-upload-list.ant-upload-list-picture-card .ant-upload-list-item-container,
-    .ant-upload-list-item-container,
+  :where(.css-dev-only-do-not-override-1v5z42l).ant-upload-wrapper.ant-upload-picture-circle-wrapper .ant-upload-list.ant-upload-list-picture-card .ant-upload-list-item-container,
-  :where(.css-dev-only-do-not-override-1v5z42l).ant-upload-wrapper.ant-upload-picture-circle-wrapper
+  :where(.css-dev-only-do-not-override-1v5z42l).ant-upload-wrapper.ant-upload-picture-card-wrapper .ant-upload-list.ant-upload-list-picture-circle .ant-upload-list-item-container,
-    .ant-upload-list.ant-upload-list-picture-card
+  :where(.css-dev-only-do-not-override-1v5z42l).ant-upload-wrapper.ant-upload-picture-circle-wrapper .ant-upload-list.ant-upload-list-picture-circle .ant-upload-list-item-container {
-    .ant-upload-list-item-container,
-  :where(.css-dev-only-do-not-override-1v5z42l).ant-upload-wrapper.ant-upload-picture-card-wrapper
-    .ant-upload-list.ant-upload-list-picture-circle
-    .ant-upload-list-item-container,
-  :where(.css-dev-only-do-not-override-1v5z42l).ant-upload-wrapper.ant-upload-picture-circle-wrapper
-    .ant-upload-list.ant-upload-list-picture-circle
-    .ant-upload-list-item-container {
     width: 65px;
     height: 65px;
   }
@@ -125,6 +118,7 @@
     left: 2px;
   }
 }
+
 .ProSubRowFlex {
   display: flex;
   flex-wrap: wrap;
@@ -501,6 +495,7 @@
   .ant-form-item {
     margin-bottom: 0;
   }
+
   .ant-input {
     padding: 4px 14px 6px 11px !important;
     text-decoration: underline;
@@ -526,6 +521,7 @@
   width: 100%;
   display: flex;
   justify-content: flex-end;
+
   @media (max-width: 500px) {
     position: fixed;
     right: 10px;
@@ -533,11 +529,112 @@
   }
 }
 
+.direct-sale-container {
+  .uom-select {
+    width: 90px !important;
+  }
+
+  .tax-select {
+    width: 120px !important;
+  }
+
+  .tax-select,
+  .uom-select {
+
+    .ant-select-selection-placeholder,
+    .ant-select-selection-item {
+      padding-inline-end: 0 !important;
+      padding-top: 0 !important;
+      margin-top: 0 !important;
+    }
+  }
+
+  .ant-select-arrow {
+    top: 60% !important;
+  }
+
+  .ant-input {
+    padding: 6px 14px 6px 11px !important;
+  }
+
+  .ant-select-single:not(.ant-select-customize-input) .ant-select-selector {
+    height: 36.5px !important;
+  }
+
+}
+
+.directsaleBTN {
+
+  .ant-btn {
+    width: max-content !important;
+    height: 36px !important;
+    z-index: 0;
+  }
+
+  .ant-btn:disabled,
+  .ant-btn[disabled] {
+    background-color: #f5f5f5;
+    color: rgba(0, 0, 0, 0.25);
+  }
+
+  .ant-btn:not(:disabled) {
+    background-color: #10b981;
+    color: #fff;
+    font-size: 14px;
+    height: 36px !important;
+    border-radius: 6px;
+    font-family: "Poppins";
+
+    &:hover {
+
+      background: #ffffff !important;
+      background-color: #ffffff !important;
+      color: #10b981;
+      border-color: #10b981;
+    }
+  }
+
+  .save-btn {
+    background-color: #0088ff !important;
+
+    &:hover {
+      color: #0088ff !important;
+      border-color: #0088ff !important;
+    }
+  }
+
+  .ant-btn:not(:disabled):nth-child(2) {
+    background-color: #1292ee;
+    color: #fff;
+    font-size: 14px;
+    height: 36px !important;
+    border-radius: 6px;
+
+  }
+
+}
+
+
+.DirectSaleTable {
+  height: 70vh;
+  overflow: auto;
+  scrollbar-width: thin;
+}
+
+.requiredIcons {
+  width: 12px;
+  border-radius: 6px;
+  height: 12px;
+  background-color: #fff;
+  padding: 2px;
+}
+
 .ProductMainRowFlex {
   display: flex;
   align-items: flex-start;
   gap: 1rem;
   width: 100%;
+
   @media (max-width: 768px) {
     flex-direction: column;
   }