diff --git a/src/components/FloatingButton/FloatingButton.module.css b/src/components/FloatingButton/FloatingButton.module.css index 651f5e0..57ef10f 100644 --- a/src/components/FloatingButton/FloatingButton.module.css +++ b/src/components/FloatingButton/FloatingButton.module.css @@ -13,7 +13,6 @@ :global(.darkApp) .scrollToTopButton { background-color: var(--primary) !important; border-color: var(--primary) !important; - color: #000000 !important; } :global(.darkApp) .scrollToTopButton:hover { diff --git a/src/components/Icons/cart/CartIcon.tsx b/src/components/Icons/cart/CartIcon.tsx index 2b5c61c..a4fdf9e 100644 --- a/src/components/Icons/cart/CartIcon.tsx +++ b/src/components/Icons/cart/CartIcon.tsx @@ -6,9 +6,9 @@ interface CartType { const CartIcon = ({ className, onClick }: CartType) => { return ( state.locale); const { themeName } = useAppSelector((state) => state.theme); - const { isMobile, isTablet } = useBreakPoint(); const { id } = useParams(); const navigate = useNavigate(); const items = useAppSelector(selectCartItems); @@ -23,34 +21,33 @@ export function CartButton() { const totalItems = items.reduce((sum, item) => sum + item.quantity, 0); return ( - <> - } - onClick={onCartClick} - className={`${styles.scrollToTopButton}`} - style={{ - position: "fixed", - bottom: isMobile ? "100px" : isTablet ? "120px" : "20px", - right: !isRTL ? "auto" : "20px", - left: !isRTL ? "20px" : "auto", - zIndex: 1000, - boxShadow: "0 4px 12px rgba(0, 0, 0, 0.15)", - backgroundColor: - themeName === "dark" ? colors.primary : colors.primary, - borderColor: themeName === "dark" ? colors.primary : colors.primary, - width: isMobile ? 48 : 56, - height: isMobile ? 48 : 56, - }} - > - + + } + onClick={onCartClick} + className={`${styles.scrollToTopButton}`} + style={{ + boxShadow: "0 4px 12px rgba(0, 0, 0, 0.15)", + backgroundColor: + themeName === "dark" ? colors.primary : colors.primary, + borderColor: themeName === "dark" ? colors.primary : colors.primary, + width: 56, + height: 56, + gap: "0", // this overrides antd's gap that is preventing centering icon + }} /> - - + + ); } diff --git a/src/pages/menu/components/MenuFooter/MenuFooter.tsx b/src/pages/menu/components/MenuFooter/MenuFooter.tsx index efbe5e4..e60837f 100644 --- a/src/pages/menu/components/MenuFooter/MenuFooter.tsx +++ b/src/pages/menu/components/MenuFooter/MenuFooter.tsx @@ -73,7 +73,7 @@ export function MenuFooter() {