diff --git a/src/components/Icons/StarIcon.tsx b/src/components/Icons/StarIcon.tsx new file mode 100644 index 0000000..097feb1 --- /dev/null +++ b/src/components/Icons/StarIcon.tsx @@ -0,0 +1,29 @@ +interface StarIconType { + className?: string; + onClick?: () => void; +} + +const StarIcon = ({ className, onClick }: StarIconType) => { + return ( + + + + ); +}; + +export default StarIcon; diff --git a/src/index.css b/src/index.css index e424b3d..fe6269c 100644 --- a/src/index.css +++ b/src/index.css @@ -11,7 +11,7 @@ --secondary-background: #ffffff; --secondary-foreground: #0a0a0a; --primary-dark: #0a0a0a; - --primary: #FFC600; + --primary: #ffc600; --primary2: #ffc600; --secondary: #09237d; --text-color: #fff; @@ -26,9 +26,7 @@ ); /* Typography */ - --font-roboto: - "Outfit", system-ui, -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, - sans-serif; + --font-roboto: Outfit; --font-weight-light: 300; --font-weight-regular: 400; --font-weight-medium: 500; diff --git a/src/pages/menu/components/CategoriesList/CategoriesList.tsx b/src/pages/menu/components/CategoriesList/CategoriesList.tsx index 20f0a7d..fdbcef4 100644 --- a/src/pages/menu/components/CategoriesList/CategoriesList.tsx +++ b/src/pages/menu/components/CategoriesList/CategoriesList.tsx @@ -300,9 +300,20 @@ export function CategoriesList({ categories }: CategoriesListProps) { display: "inline-block", }} > - {isRTL - ? category.name || category.nameEN - : category.nameEN || category.name} + + {isRTL + ? category.name || category.nameEN + : category.nameEN || category.name} + diff --git a/src/pages/menu/components/MenuList/ProductCard.module.css b/src/pages/menu/components/MenuList/ProductCard.module.css index adf1e64..685e15d 100644 --- a/src/pages/menu/components/MenuList/ProductCard.module.css +++ b/src/pages/menu/components/MenuList/ProductCard.module.css @@ -68,15 +68,14 @@ overflow: hidden; } -.loyaltyButton { +/* .loyaltyButton { position: absolute; top: 1px; left: 1px; z-index: 99; - background-color: var(--primary) !important; color: white !important; border: none !important; -} +} */ :global(.ant-app-rtl) .loyaltyButton { right: 1px !important; diff --git a/src/pages/menu/components/MenuList/ProductCard.tsx b/src/pages/menu/components/MenuList/ProductCard.tsx index 17a37fb..9e78203 100644 --- a/src/pages/menu/components/MenuList/ProductCard.tsx +++ b/src/pages/menu/components/MenuList/ProductCard.tsx @@ -1,10 +1,9 @@ import styles from "pages/menu/components/MenuList/ProductCard.module.css"; -import { Card, Button, Badge } from "antd"; +import { Card, Badge } from "antd"; import ProText from "components/ProText.tsx"; import ArabicPrice from "components/ArabicPrice"; import { colors } from "ThemeConstants.ts"; import { ItemDescriptionIcons } from "components/ItemDescriptionIcons/ItemDescriptionIcons.tsx"; -import { StarOutlined } from "@ant-design/icons"; import ImageWithFallback from "components/ImageWithFallback"; import { Product } from "utils/types/appTypes.ts"; import useBreakPoint from "hooks/useBreakPoint.ts"; @@ -12,13 +11,13 @@ import { useAppSelector } from "redux/hooks.ts"; import { useParams, useNavigate } from "react-router-dom"; import { ProductPreviewDialog } from "pages/menu/components/ProductPreviewDialog"; import { useState } from "react"; +import StarIcon from "components/Icons/StarIcon"; type Props = { item: Product; }; export default function ProductCard({ item }: Props) { const { isRTL } = useAppSelector((state) => state.locale); - const { themeName } = useAppSelector((state) => state.theme); const { isMobile, isTablet, isDesktop } = useBreakPoint(); const { items } = useAppSelector((state) => state.order); const { subdomain } = useParams(); @@ -86,15 +85,17 @@ export default function ProductCard({ item }: Props) { gap: "0.5rem", }} > + {isRTL ? item.name : item.nameOther} @@ -111,10 +112,13 @@ export default function ProductCard({ item }: Props) { textOverflow: "ellipsis", wordWrap: "break-word", overflowWrap: "break-word", - lineHeight: "1.5rem", maxHeight: "3em", - fontSize: "1rem", - letterSpacing: "0.01em", + fontWeight: 500, + fontStyle: "Medium", + fontSize: "12px", + // leadingTrim: "NONE", + lineHeight: "140%", + letterSpacing: "0%", }} > {item.description} @@ -157,13 +161,9 @@ export default function ProductCard({ item }: Props) {
- {item.isHasLoyalty && ( -