Merge pull request 'Productcss coflict Solved' (#139) from DesignFeb12 into main

Reviewed-on: Pozomind/pozo-retail-app#139

src/Styles/Product/Product.scss

@@ -1,23 +1,21 @@
 .cropUploadFieldSmall {
-
+  :where(.css-dev-only-do-not-override-1v5z42l).ant-upload-wrapper.ant-upload-picture-card-wrapper
-  :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.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-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-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
-  :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.ant-upload-list-picture-card
+    .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;
   }
 }
 
-// .cropUploadFieldSmallNoData {
-
-//   :where(.css-dev-only-do-not-override-1v5z42l).ant-upload-wrapper.ant-upload-picture-card-wrapper .ant-upload.ant-upload-select,
-//   :where(.css-dev-only-do-not-override-1v5z42l).ant-upload-wrapper.ant-upload-picture-circle-wrapper .ant-upload.ant-upload-select {
-//     width: 65px;
-//     height: 65px;
-//   }
-// }
-
 .productinputForm {
   display: flex;
   flex-wrap: wrap;
@@ -118,7 +116,6 @@
     left: 2px;
   }
 }
-
 .ProSubRowFlex {
   display: flex;
   flex-wrap: wrap;
@@ -166,7 +163,6 @@
   display: flex;
   flex-direction: column;
 
-  // justify-content: space-between;
   & label {
     font-weight: 600;
   }
@@ -192,8 +188,6 @@
   justify-content: center;
   width: min(176px, 188px);
   height: 52px;
-  // width: 20%;
-  // height: 45px;
   padding: 10px 0px;
   cursor: pointer;
 }
@@ -339,14 +333,14 @@
 }
 
 .viewerExcelupload .ant-table-wrapper,
-.viewerExcelupload .ant-table-tbody>tr.ant-table-row>td {
+.viewerExcelupload .ant-table-tbody > tr.ant-table-row > td {
   padding: 4px;
   font-size: 14px;
   font-weight: 600;
 }
 
 .viewerExcelupload .ant-table-wrapper,
-.viewerExcelupload .ant-table-thead>tr>th {
+.viewerExcelupload .ant-table-thead > tr > th {
   padding: 1px 8px !important;
 }
 
@@ -401,16 +395,12 @@
 }
 
 .productinputForm {
-  .ant-input-affix-wrapper>input.ant-input {
+  .ant-input-affix-wrapper > input.ant-input {
     padding-top: 1.5rem;
   }
 }
 
 .productMtrImgUpload1 {
-  // .ant-modal-body {
-  //   height: 400px;
-  // }
-
   .productMtrImgUpload {
     display: flex;
     align-items: center;
@@ -455,7 +445,7 @@
 }
 
 .product-Add-HSN {
-  .ant-input-affix-wrapper>input.ant-input {
+  .ant-input-affix-wrapper > input.ant-input {
     padding: 12px 0 0 0 !important;
   }
 }
@@ -495,7 +485,6 @@
   .ant-form-item {
     margin-bottom: 0;
   }
-
   .ant-input {
     padding: 4px 14px 6px 11px !important;
     text-decoration: underline;
@@ -521,7 +510,6 @@
   width: 100%;
   display: flex;
   justify-content: flex-end;
-
   @media (max-width: 500px) {
     position: fixed;
     right: 10px;
@@ -540,7 +528,6 @@
 
   .tax-select,
   .uom-select {
-
     .ant-select-selection-placeholder,
     .ant-select-selection-item {
       padding-inline-end: 0 !important;
@@ -560,11 +547,9 @@
   .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;
@@ -586,7 +571,6 @@
     font-family: "Poppins";
 
     &:hover {
-
       background: #ffffff !important;
       background-color: #ffffff !important;
       color: #10b981;
@@ -609,12 +593,9 @@
     font-size: 14px;
     height: 36px !important;
     border-radius: 6px;
-
   }
-
 }
 
-
 .DirectSaleTable {
   height: 70vh;
   overflow: auto;
@@ -634,8 +615,30 @@
   align-items: flex-start;
   gap: 1rem;
   width: 100%;
-
   @media (max-width: 768px) {
     flex-direction: column;
   }
-}
+}
+.customerOffer {
+  width: 16rem;
+  height: 3rem;
+  background-color: #f5f5f5;
+  border-radius: 5px;
+  display: flex;
+  cursor: pointer;
+}
+
+.customerOffer div {
+  width: 50%;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  gap: 0.5rem;
+  border-radius: 5px;
+}
+
+.prodMasterAddDetails {
+  display: flex;
+  align-items: center;
+  gap: 10px;
+}