From e13df3c7b71d55551aac56b3b167573e9a2ac78c Mon Sep 17 00:00:00 2001 From: Your Name Date: Tue, 3 Mar 2026 12:59:32 +0530 Subject: [PATCH] Alignment Issue --- .../ListofInvoices/ListOfSalesInvoices.jsx | 11 +- .../StandardTable/StandardTable.scss | 104 +++++++++--------- .../Components/BSItemCards/BSItemCard.jsx | 31 +++--- .../Components/BSNavbar/BSNavbar1.jsx | 2 +- .../Components/BSNavbar/BSNavbar2.jsx | 3 + .../UtillComponents/BSNavBarWholeSale.jsx | 3 +- src/Pages/VoiceToText/VoiceToText.scss | 5 +- .../BSBillingTables3/BSBillingTable3.scss | 27 +++-- .../BSCategories/BSCategoryVertical.scss | 17 +++ .../Components/BSItemCards/BSItemCard.scss | 47 +------- .../Components/BSNavbar/BSNavbar1.scss | 6 +- .../Components/BSNavbar/BSNavbar2.scss | 25 ++++- .../Components/BSNavbar/BSNavbar3.scss | 8 +- .../UtillComponents/BSNavBarComponents.scss | 72 +++--------- .../Template/BSLayout1/BSLayout1.scss | 2 +- .../Template/BSLayout2/BSLayout2.scss | 7 +- .../Template/BSLayout3/BSLayout3.scss | 9 +- .../Template/BSLayout4/BSLayout4.scss | 4 +- .../Template/BSLayout6/BSLayout6.scss | 4 +- .../Template/BSLayout7/Combo1.scss | 5 +- .../ItemWiseReport/ItemWiseReport.scss | 44 +------- 21 files changed, 175 insertions(+), 261 deletions(-) diff --git a/src/Pages/BookingScreen/Components/BSBillingTables/ListofInvoices/ListOfSalesInvoices.jsx b/src/Pages/BookingScreen/Components/BSBillingTables/ListofInvoices/ListOfSalesInvoices.jsx index 0c687f7..3786a00 100644 --- a/src/Pages/BookingScreen/Components/BSBillingTables/ListofInvoices/ListOfSalesInvoices.jsx +++ b/src/Pages/BookingScreen/Components/BSBillingTables/ListofInvoices/ListOfSalesInvoices.jsx @@ -17,7 +17,7 @@ import BSBillingEbill from '../BSBillingEwayBill/BSBillingEbill'; import Search from '../../../../../Components/Forms/Search'; import { IoEye } from 'react-icons/io5'; // src\Styles\BookingScreen\Components\UtillComponents\BSNavBarComponents.scss -import "../../../../../Styles/BookingScreen/Components/UtillComponents/BSNavBarComponents.scss" +import '../../../../../Styles/BookingScreen/Components/UtillComponents/BSNavBarComponents.scss'; const { RangePicker } = DatePicker; const ListOfSalesInvoices = (props) => { @@ -451,7 +451,14 @@ const ListOfSalesInvoices = (props) => { handleCancel={handleProductmodalCancel} footer={false} children={ -
+
th { + > th { font-size: 10px !important; font-weight: 400 !important; -webkit-text-stroke-width: 0.2px; @@ -77,7 +77,7 @@ .booking-billing-table-row { background-color: rgba(235, 235, 236, 1); - font-family: 'Inter', ui-sans-serif, system-ui, sans-serif !important; + font-family: "Inter", ui-sans-serif, system-ui, sans-serif !important; font-size: 16px; font-style: normal; font-weight: bold; @@ -224,7 +224,7 @@ } .price-rate { - font-family: 'Inter', ui-sans-serif, system-ui, sans-serif !important; + font-family: "Inter", ui-sans-serif, system-ui, sans-serif !important; font-size: 30px; font-weight: 600; line-height: 50px; @@ -233,7 +233,7 @@ .booking-billing-items { color: var(--SELECTED_COLOR); text-align: right; - font-family: 'Inter', ui-sans-serif, system-ui, sans-serif !important; + font-family: "Inter", ui-sans-serif, system-ui, sans-serif !important; font-size: 20px; font-style: normal; font-weight: bold; @@ -285,7 +285,7 @@ .table-items { text-align: center; font-size: 14px; - font-family: 'Inter', ui-sans-serif, system-ui, sans-serif !important; + font-family: "Inter", ui-sans-serif, system-ui, sans-serif !important; align-items: right; text-align: left; font-weight: 600; @@ -293,7 +293,7 @@ .table-item-price { text-align: center; - font-family: 'Inter', ui-sans-serif, system-ui, sans-serif !important; + font-family: "Inter", ui-sans-serif, system-ui, sans-serif !important; font-size: 14px; text-align: right; font-weight: 600; @@ -301,7 +301,7 @@ .extra-price-item { color: var(--SELECTED_COLOR); - font-family: 'Inter', ui-sans-serif, system-ui, sans-serif !important; + font-family: "Inter", ui-sans-serif, system-ui, sans-serif !important; font-size: 20px; font-style: normal; } @@ -323,11 +323,11 @@ text-align: right; font-weight: 600; font-size: 18px; - font-family: 'Inter', ui-sans-serif, system-ui, sans-serif !important; + font-family: "Inter", ui-sans-serif, system-ui, sans-serif !important; } .booking-billing-table-container { - font-family: 'Inter', ui-sans-serif, system-ui, sans-serif !important; + font-family: "Inter", ui-sans-serif, system-ui, sans-serif !important; position: relative; transition: all 0.3s ease; height: 100%; @@ -458,7 +458,7 @@ border: #545454 solid 1px; color: rgb(0, 0, 0); align-items: center; - font-family: 'Inter', ui-sans-serif, system-ui, sans-serif !important; + font-family: "Inter", ui-sans-serif, system-ui, sans-serif !important; cursor: pointer; border-radius: 8px; font-size: 22px; @@ -533,7 +533,7 @@ .booking-billing-table-row-disabled { pointer-events: none; background-color: rgb(243, 248, 213); - font-family: 'Inter', ui-sans-serif, system-ui, sans-serif !important; + font-family: "Inter", ui-sans-serif, system-ui, sans-serif !important; font-size: 16px; font-style: normal; font-weight: bold; @@ -679,7 +679,7 @@ text-align: center; font-weight: 600; font-size: 14px; - font-family: 'Inter', ui-sans-serif, system-ui, sans-serif !important; + font-family: "Inter", ui-sans-serif, system-ui, sans-serif !important; padding: 0rem 1rem; display: inline-block; padding: 2px; @@ -699,7 +699,7 @@ display: flex; flex-direction: column; max-height: 150px; - font-family: 'Inter', ui-sans-serif, system-ui, sans-serif !important; + font-family: "Inter", ui-sans-serif, system-ui, sans-serif !important; overflow-y: auto; } @@ -796,7 +796,7 @@ .payment-mode-button-selected { display: flex; padding: 5px 14px; - font-family: 'Inter', ui-sans-serif, system-ui, sans-serif !important; + font-family: "Inter", ui-sans-serif, system-ui, sans-serif !important; background-color: var(--DEFAULT_SELECTED_COLOR); border: none; border-radius: 4.982px; @@ -907,7 +907,7 @@ display: flex; padding: 5px 14px; height: 23px; - font-family: 'Inter', ui-sans-serif, system-ui, sans-serif !important; + font-family: "Inter", ui-sans-serif, system-ui, sans-serif !important; background-color: var(--DEFAULT_SELECTED_COLOR); border: none; border-radius: 4.982px; @@ -944,7 +944,7 @@ .customer-mobile-name { display: flex; flex-wrap: wrap; - flex-direction: 'row'; + flex-direction: "row"; column-gap: 2rem; } @@ -1004,7 +1004,7 @@ .billing-table-header { padding: 4px; - font-family: 'Inter', ui-sans-serif, system-ui, sans-serif !important; + font-family: "Inter", ui-sans-serif, system-ui, sans-serif !important; } .body-tooltip { @@ -1106,7 +1106,7 @@ background-color: #2563eb; border-bottom: 1px solid #ccc; color: #fff; - font-family: 'Inter', ui-sans-serif, system-ui, sans-serif !important; + font-family: "Inter", ui-sans-serif, system-ui, sans-serif !important; cursor: pointer; transition: background-color 0.2s ease; position: sticky; @@ -1123,13 +1123,13 @@ gap: 1rem; white-space: nowrap; - >div { + > div { font-size: 1rem; font-weight: 500; - font-family: 'Inter', ui-sans-serif, system-ui, sans-serif !important; + font-family: "Inter", ui-sans-serif, system-ui, sans-serif !important; } - >p { + > p { background-color: #fff3; font-size: 10px; padding: 1px 6px; @@ -1146,7 +1146,7 @@ background-color: #2563eb; border-bottom: 1px solid #ccc; color: #fff; - font-family: 'Inter', ui-sans-serif, system-ui, sans-serif !important; + font-family: "Inter", ui-sans-serif, system-ui, sans-serif !important; cursor: pointer; transition: background-color 0.2s ease; position: sticky; @@ -1154,9 +1154,7 @@ z-index: 10; @media (max-width: 768px) { - background-color: linear-gradient(to bottom right, - #1e2536, - #2a3447) !important; + background-color: linear-gradient(to bottom right, #1e2536, #2a3447) !important; background: linear-gradient(to bottom right, #1e2536, #2a3447) !important; display: flex !important; } @@ -1171,13 +1169,13 @@ gap: 1rem; white-space: nowrap; - >div { + > div { font-size: 1.125rem; font-weight: 500; - font-family: 'Inter', ui-sans-serif, system-ui, sans-serif !important; + font-family: "Inter", ui-sans-serif, system-ui, sans-serif !important; } - >p { + > p { background-color: #fff3; font-size: small; padding: 1px 6px; @@ -1193,11 +1191,11 @@ padding: 12px 16px; .ShoppingCartMain-left { - >div { + > div { font-size: 1rem; } - >p { + > p { font-size: 0.75rem; } } @@ -1208,11 +1206,11 @@ align-items: flex-start; .ShoppingCartMain-left { - >div { + > div { font-size: 0.875rem; } - >p { + > p { font-size: 0.7rem; } } @@ -1245,7 +1243,7 @@ .CheckoutButton { width: 100%; padding: 1.2rem; - font-family: 'Inter', ui-sans-serif, system-ui, sans-serif !important; + font-family: "Inter", ui-sans-serif, system-ui, sans-serif !important; background-color: #0d9488; color: #fff; border: none; @@ -1271,7 +1269,7 @@ .standard-pay-btn-refund { padding: 0.9rem 0.75rem; font-size: 1.125rem; - font-family: 'Inter', ui-sans-serif, system-ui, sans-serif !important; + font-family: "Inter", ui-sans-serif, system-ui, sans-serif !important; border: none; border-radius: 4px; cursor: pointer; @@ -1292,7 +1290,7 @@ .standard-pay-btn { padding: 0.9rem 0.75rem; font-size: 1.125rem; - font-family: 'Inter', ui-sans-serif, system-ui, sans-serif !important; + font-family: "Inter", ui-sans-serif, system-ui, sans-serif !important; border: none; border-radius: 4px; cursor: pointer; @@ -1320,7 +1318,7 @@ width: 100%; padding: 0.7rem 0.75rem; font-size: 1.125rem; - font-family: 'Inter', ui-sans-serif, system-ui, sans-serif !important; + font-family: "Inter", ui-sans-serif, system-ui, sans-serif !important; border: none; border-radius: 4px; cursor: pointer; @@ -1349,7 +1347,7 @@ .paybutton { padding: 0.7rem 0.75rem; font-size: 16px; - font-family: 'Inter', ui-sans-serif, system-ui, sans-serif !important; + font-family: "Inter", ui-sans-serif, system-ui, sans-serif !important; color: #ffffff; border: none; border-radius: 4px; @@ -1373,7 +1371,7 @@ .paybutton-selected { padding: 0.7rem 0.75rem; font-size: 16px; - font-family: 'Inter', ui-sans-serif, system-ui, sans-serif !important; + font-family: "Inter", ui-sans-serif, system-ui, sans-serif !important; color: #ffffff; border: none; border-radius: 4px; @@ -1420,7 +1418,7 @@ display: flex; flex-direction: column; gap: 10px; - font-family: 'Inter', ui-sans-serif, system-ui, sans-serif !important; + font-family: "Inter", ui-sans-serif, system-ui, sans-serif !important; font-weight: 500; border: 1px solid #e5e7eb; padding: 10px; @@ -1454,14 +1452,14 @@ font-weight: 400; -webkit-text-stroke-width: 0.2px; color: #4b5563; - font-family: 'Inter', ui-sans-serif, system-ui, sans-serif !important; + font-family: "Inter", ui-sans-serif, system-ui, sans-serif !important; } p { font-size: 0.9rem; font-weight: 500; -webkit-text-stroke-width: 0.2px; - font-family: 'Inter', ui-sans-serif, system-ui, sans-serif !important; + font-family: "Inter", ui-sans-serif, system-ui, sans-serif !important; color: #4b5563; } } @@ -1474,7 +1472,7 @@ font-size: 0.875rem; font-weight: 500; color: #16a34a; - font-family: 'Inter', ui-sans-serif, system-ui, sans-serif !important; + font-family: "Inter", ui-sans-serif, system-ui, sans-serif !important; } p { @@ -1482,7 +1480,7 @@ font-weight: 500; -webkit-text-stroke-width: 0.2px; color: #16a34a; - font-family: 'Inter', ui-sans-serif, system-ui, sans-serif !important; + font-family: "Inter", ui-sans-serif, system-ui, sans-serif !important; } } @@ -1496,7 +1494,7 @@ font-size: 18px; font-weight: 500; color: #1f2937; - font-family: 'Inter', ui-sans-serif, system-ui, sans-serif !important; + font-family: "Inter", ui-sans-serif, system-ui, sans-serif !important; } p { @@ -1504,7 +1502,7 @@ font-weight: 500; -webkit-text-stroke-width: 0.3px; color: #16a34a; - font-family: 'Inter', ui-sans-serif, system-ui, sans-serif !important; + font-family: "Inter", ui-sans-serif, system-ui, sans-serif !important; } } @@ -1525,7 +1523,7 @@ padding: 1px 10px 4px 10px; border-radius: 50px; cursor: pointer; - font-family: 'Inter', ui-sans-serif, system-ui, sans-serif !important; + font-family: "Inter", ui-sans-serif, system-ui, sans-serif !important; border: none; @media (max-width: 768px) { @@ -1541,7 +1539,7 @@ .Table3-items { font-weight: 400; font-size: 14px; - font-family: 'Inter', ui-sans-serif, system-ui, sans-serif !important; + font-family: "Inter", ui-sans-serif, system-ui, sans-serif !important; } .shoppingCartLeft { @@ -1558,7 +1556,7 @@ .paybutton { padding: 10px 12px; - >svg { + > svg { display: none !important; } } @@ -1608,13 +1606,13 @@ font-weight: 500; -webkit-text-stroke-width: 0.3px; color: #ffffff; - font-family: 'Inter', ui-sans-serif, system-ui, sans-serif !important; + font-family: "Inter", ui-sans-serif, system-ui, sans-serif !important; } .standard-pay-btns { flex: 1; - >button { + > button { width: 100%; } } @@ -1668,4 +1666,4 @@ @media (max-width: 768px) { display: flex; } -} \ No newline at end of file +} diff --git a/src/Pages/BookingScreen/Components/BSItemCards/BSItemCard.jsx b/src/Pages/BookingScreen/Components/BSItemCards/BSItemCard.jsx index b5bbe85..768c6e8 100644 --- a/src/Pages/BookingScreen/Components/BSItemCards/BSItemCard.jsx +++ b/src/Pages/BookingScreen/Components/BSItemCards/BSItemCard.jsx @@ -6076,22 +6076,25 @@ const BSItemCard = (props) => { zIndex: '12', top: templateData?.BookingNavbar?.[0] === 'Navbar3' && - [ - 'Layout1', - 'Layout2', - 'Layout3', - 'Layout4', - 'Layout5', - 'Layout6', - ].includes(templateData?.BookingLayout?.[0]) - ? '4.4rem' - : ['Layout4', 'Layout5', 'Layout6'].includes( + templateData?.BookingLayout?.[0] === 'Layout3' + ? '1rem' + : templateData?.BookingNavbar?.[0] === 'Navbar3' && + ['Layout1', 'Layout2'].includes( templateData?.BookingLayout?.[0] ) - ? '2.8rem' - : templateData?.BookingNavbar?.[0] === 'Navbar3' - ? '3rem' - : '', + ? '13px' + : templateData?.BookingNavbar?.[0] === 'Navbar3' && + ['Layout4', 'Layout5', 'Layout6'].includes( + templateData?.BookingLayout?.[0] + ) + ? '4.4rem' + : ['Layout4', 'Layout5', 'Layout6'].includes( + templateData?.BookingLayout?.[0] + ) + ? '2.8rem' + : templateData?.BookingNavbar?.[0] === 'Navbar3' + ? '3rem' + : '', }} > { } trigger="click" - placement="left" + placement="left" open={open} onOpenChange={handleOpenChange} > diff --git a/src/Pages/BookingScreen/Components/BSNavbar/BSNavbar2.jsx b/src/Pages/BookingScreen/Components/BSNavbar/BSNavbar2.jsx index 11323cd..d13e7a4 100644 --- a/src/Pages/BookingScreen/Components/BSNavbar/BSNavbar2.jsx +++ b/src/Pages/BookingScreen/Components/BSNavbar/BSNavbar2.jsx @@ -871,9 +871,12 @@ const BSNavbar2 = () => { )} )} +
+ {SalesMode?.SettingValue === 'Y' && !OtherServicesglobal && ( )} +
{!OtherServicesglobal && ScanLayoutScreen?.SettingValue === 'Y' && ( )} diff --git a/src/Pages/BookingScreen/Components/UtillComponents/BSNavBarWholeSale.jsx b/src/Pages/BookingScreen/Components/UtillComponents/BSNavBarWholeSale.jsx index 9f91b4e..5f0e0b8 100644 --- a/src/Pages/BookingScreen/Components/UtillComponents/BSNavBarWholeSale.jsx +++ b/src/Pages/BookingScreen/Components/UtillComponents/BSNavBarWholeSale.jsx @@ -27,6 +27,7 @@ const BSNavBarWholeSale = ({ drawerOpen = false, setDrawerOpen = () => { } }) => border: 'none', outline: 'none', cursor: 'pointer', + padding:"10px", }; const iconStyle = { @@ -59,7 +60,7 @@ const BSNavBarWholeSale = ({ drawerOpen = false, setDrawerOpen = () => { } }) => }, [drawerOpen?.wholesale]) return ( -