change font and primary color

This commit is contained in:
2025-12-09 10:54:42 +03:00
parent 7f06d3524d
commit 09906dadd3
9 changed files with 41 additions and 26 deletions

View File

@@ -2,7 +2,7 @@
import type { ThemeConfig } from "antd"; import type { ThemeConfig } from "antd";
export const colors = { export const colors = {
primary: "#FFD633", primary: "#FFC600",
secondary: "linear-gradient(135deg, #00C1D4 0%, #FF5F6D 100%)", secondary: "linear-gradient(135deg, #00C1D4 0%, #FF5F6D 100%)",
darkSpace: "linear-gradient(to right, #0F0525, #2A0B45)", darkSpace: "linear-gradient(to right, #0F0525, #2A0B45)",
}; };
@@ -29,7 +29,7 @@ export const lightColors = {
800: "#003650", 800: "#003650",
900: "#001620", 900: "#001620",
borderColor: "#E7EAF3B2", borderColor: "#E7EAF3B2",
primaryColor: "#FFD633", primaryColor: "#FFC600",
secondaryColor: "#09237D", secondaryColor: "#09237D",
whiteColor: "#FFF", whiteColor: "#FFF",
blackColor: "#000000e0", blackColor: "#000000e0",
@@ -59,7 +59,7 @@ export const darkColors = {
// Semantic colors // Semantic colors
borderColor: "#363636", borderColor: "#363636",
borderColorLight: "#424242", borderColorLight: "#424242",
primaryColor: "#FFD633", primaryColor: "#FFC600",
primaryColorHover: "#FFD633", primaryColorHover: "#FFD633",
primaryColorActive: "#E6B800", primaryColorActive: "#E6B800",
secondaryColor: "#FFD633", secondaryColor: "#FFD633",

View File

@@ -10,6 +10,8 @@
background-color: var(--secondary-background); background-color: var(--secondary-background);
border: none; border: none;
margin-bottom: 1rem; margin-bottom: 1rem;
margin: 16px;
border-radius: 6px;
} }
.loyaltyContainer :global(.ant-card-body) { .loyaltyContainer :global(.ant-card-body) {

View File

@@ -88,7 +88,7 @@ const LoyaltyCard = () => {
</ProText> </ProText>
</Col> </Col>
<Col> <Col>
<PresentIcon /> {/* <PresentIcon /> */}
</Col> </Col>
</Row> </Row>
)} )}

View File

@@ -11,7 +11,7 @@
--secondary-background: #ffffff; --secondary-background: #ffffff;
--secondary-foreground: #0a0a0a; --secondary-foreground: #0a0a0a;
--primary-dark: #0a0a0a; --primary-dark: #0a0a0a;
--primary: #ffd633; --primary: #FFC600;
--primary2: #ffc600; --primary2: #ffc600;
--secondary: #09237d; --secondary: #09237d;
--text-color: #fff; --text-color: #fff;
@@ -27,8 +27,8 @@
/* Typography */ /* Typography */
--font-roboto: --font-roboto:
"Nunito Sans", system-ui, -apple-system, BlinkMacSystemFont, "Segoe UI", "Outfit", system-ui, -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto,
Roboto, sans-serif; sans-serif;
--font-weight-light: 300; --font-weight-light: 300;
--font-weight-regular: 400; --font-weight-regular: 400;
--font-weight-medium: 500; --font-weight-medium: 500;

View File

@@ -117,7 +117,7 @@
transition: all 0.4s cubic-bezier(0.25, 0.46, 0.45, 0.94); transition: all 0.4s cubic-bezier(0.25, 0.46, 0.45, 0.94);
will-change: position, transform, opacity, filter; will-change: position, transform, opacity, filter;
transform-origin: top center; transform-origin: top center;
gap: 0.5rem; gap: 14px;
padding: 0.5rem 1rem 1rem 1rem; padding: 0.5rem 1rem 1rem 1rem;
user-select: none; user-select: none;
} }

View File

@@ -190,6 +190,7 @@ export function CategoriesList({ categories }: CategoriesListProps) {
style={{ style={{
borderRadius: 8, borderRadius: 8,
border: "none", border: "none",
backgroundColor: "none",
}} }}
styles={{ styles={{
body: { body: {
@@ -250,20 +251,23 @@ export function CategoriesList({ categories }: CategoriesListProps) {
...(xs || md ...(xs || md
? { ? {
// backgroundColor: "#fff6e0", // backgroundColor: "#fff6e0",
borderBottom: isCategoriesSticky ? "solid 1px var(--primary)" : "none", borderBottom: isCategoriesSticky
borderRight: isCategoriesSticky ? "solid 1px var(--primary)" : "none", ? "solid 1px var(--primary)"
borderLeft: isCategoriesSticky ? "solid 1px var(--primary)" : "none", : "none",
borderRight: isCategoriesSticky
? "solid 1px var(--primary)"
: "none",
borderLeft: isCategoriesSticky
? "solid 1px var(--primary)"
: "none",
borderTop: isCategoriesSticky borderTop: isCategoriesSticky
? "solid 1px var(--primary)" ? "solid 1px var(--primary)"
: 0, : 0,
borderStartStartRadius: isCategoriesSticky ? 8 : 0, borderStartStartRadius: isCategoriesSticky ? 888 : 0,
borderStartEndRadius: isCategoriesSticky ? 8 : 0, borderStartEndRadius: isCategoriesSticky ? 888 : 0,
borderEndEndRadius: 8, borderEndEndRadius: isCategoriesSticky ? 888 : 0,
borderEndStartRadius: 8, borderEndStartRadius: isCategoriesSticky ? 888 : 0,
backgroundColor: backgroundColor: "var(--background)",
activeCategory === category.id
? colors.primary
: undefined,
} }
: { borderRadius: 8 }), : { borderRadius: 8 }),
width: 104, width: 104,
@@ -282,7 +286,9 @@ export function CategoriesList({ categories }: CategoriesListProps) {
textAlign: "center", textAlign: "center",
color: color:
activeCategory === category.id ? "#FFF" : undefined, activeCategory === category.id
? colors.primary
: undefined,
fontWeight: fontWeight:
activeCategory === category.id ? "600" : "500", activeCategory === category.id ? "600" : "500",
whiteSpace: "nowrap", whiteSpace: "nowrap",

View File

@@ -54,6 +54,7 @@ export default function ProductCard({ item }: Props) {
overflow: "hide", overflow: "hide",
width: "100%", width: "100%",
boxShadow: "none", boxShadow: "none",
backgroundColor: "var(--secondary-background)",
}} }}
styles={{ styles={{
body: { body: {

View File

@@ -53,6 +53,16 @@
right: -10px !important; right: -10px !important;
} }
:global(.darkApp) .restaurantHeader path {
fill: none !important;
stroke: #ffffff !important;
}
:global(.darkApp) .logoContainerIcon path {
fill: var(--background) !important;
stroke: var(--background) !important;
}
.timeIcon { .timeIcon {
position: relative; position: relative;
top: 4px; top: 4px;
@@ -121,10 +131,6 @@
margin-left: 200px; margin-left: 200px;
} }
:global(.darkApp) .restaurantHeader path {
fill: none !important;
stroke: #ffffff !important;
}
/* Enhanced Dark theme styles */ /* Enhanced Dark theme styles */
:global(.darkApp) .itemName { :global(.darkApp) .itemName {
@@ -477,7 +483,7 @@
} }
.restaurantTitle { .restaurantTitle {
font-size: 16px; font-size: 24px !important;
font-weight: bold; font-weight: bold;
margin-bottom: 0px !important; margin-bottom: 0px !important;
} }

View File

@@ -113,7 +113,7 @@ function MenuPage() {
<div className={`${styles.headerContainer}`}> <div className={`${styles.headerContainer}`}>
<div className={styles.contentWrapper}> <div className={styles.contentWrapper}>
<ProTitle level={4} className={styles.restaurantTitle}> <ProTitle className={styles.restaurantTitle}>
{isRTL ? restaurant?.nameAR : restaurant?.restautantName} {isRTL ? restaurant?.nameAR : restaurant?.restautantName}
</ProTitle> </ProTitle>