From 93474dba989adf2d6fb4d92a5a2faf6b242191af Mon Sep 17 00:00:00 2001 From: Elena Volpato Date: Tue, 5 Sep 2023 14:30:12 +0200 Subject: [PATCH 1/5] changed hex codes of colors and reorganized them --- src/routes/Layout.tsx | 29 +++++++++-------------------- 1 file changed, 9 insertions(+), 20 deletions(-) diff --git a/src/routes/Layout.tsx b/src/routes/Layout.tsx index c2976c0..807bae4 100644 --- a/src/routes/Layout.tsx +++ b/src/routes/Layout.tsx @@ -20,30 +20,19 @@ import MonthBar from "../components/MonthBar"; const theme = createTheme({ palette: { text: { - primary: "#674747", - secondary: "#999" + primary: "#674747", //dark gray + secondary: "#f9f3e3", //light cream - bg-color }, - primary: { - main: "#5a175d", //purple - light: "#f3ecf1", //cream - bg-color - dark: "#67074a", // purple/red + primary: { // green + main: "#6fa128", //light green, + dark: "#f9f3e3" , }, - secondary: { - main: "#05878a", //blue-green light - light: "#074d6790", // blue-green transparent + secondary: { // purple/red + main: "#782a33", + light: "#ce3045", + }, - //OP 1 DE CORES - /* primary: { //green - main: "#36a859", - light: "#f3ecf1", //cream - bg-color - dark: "#2c6e49", - }, - secondary: { - main: "#d55314", //orange - light: "#ffc9b9", //pink - }, */ - }, }); From 0cbdebd8581e96cd689662f4d342d98d04995972 Mon Sep 17 00:00:00 2001 From: Elena Volpato Date: Tue, 5 Sep 2023 18:04:23 +0200 Subject: [PATCH 2/5] changed colors --- src/components/HeaderBar.tsx | 2 +- src/components/MonthBar.tsx | 6 +++--- src/routes/FoodOfTheMonth.tsx | 4 +++- src/routes/FoodPage.tsx | 4 ++-- src/routes/Layout.tsx | 7 +++++-- 5 files changed, 14 insertions(+), 9 deletions(-) diff --git a/src/components/HeaderBar.tsx b/src/components/HeaderBar.tsx index a4c1c29..b86e855 100644 --- a/src/components/HeaderBar.tsx +++ b/src/components/HeaderBar.tsx @@ -103,7 +103,7 @@ export default function HeaderBar(props: Props) { })); return ( - + {leftButton()} { const ArrowButton = styled(Link)(({ theme }) => ({ color: alpha(theme.palette.primary.light, 0.75), "&:hover": { - color: alpha(theme.palette.primary.light, 0.95), + color: alpha(theme.palette.primary.light, 1), }, display: "flex", alignItems: "center", @@ -25,7 +25,7 @@ const MonthBar = () => { })); const ShadowBox = styled(Stack)(({ theme }) => ({ - boxShadow: `0 2px 4px ${theme.palette.secondary}`, + boxShadow: `0 2px 4px ${theme.palette.text.primary}`, })); return ( @@ -33,7 +33,7 @@ const MonthBar = () => { direction="row" alignItems="center" justifyContent="space-between" - bgcolor="secondary.main" + bgcolor="primary.main" color="primary.light" boxShadow="0 2px 4px #332323" > diff --git a/src/routes/FoodOfTheMonth.tsx b/src/routes/FoodOfTheMonth.tsx index a83d13e..71a705a 100644 --- a/src/routes/FoodOfTheMonth.tsx +++ b/src/routes/FoodOfTheMonth.tsx @@ -51,6 +51,8 @@ export default function FoodOfTheMonth() { setFoodType(newFoodCategory); }; + + return ( + > diff --git a/src/routes/FoodPage.tsx b/src/routes/FoodPage.tsx index 5eb89cd..e4b911f 100644 --- a/src/routes/FoodPage.tsx +++ b/src/routes/FoodPage.tsx @@ -42,13 +42,13 @@ export default function FoodPage() { const monthColor = (month: string) => { if (seasonMonths.includes(month)) { return { - backgroundColor: "secondary.dark", + backgroundColor: "primary.main", color: "primary.light", boxShadow: `0 2px 4px #888888`, }; } else { return { - color: "primary.main", + color: "secondary.light", backgroundColor: "primary.light", opacity: ".5" }; diff --git a/src/routes/Layout.tsx b/src/routes/Layout.tsx index 807bae4..b353ee0 100644 --- a/src/routes/Layout.tsx +++ b/src/routes/Layout.tsx @@ -21,11 +21,14 @@ const theme = createTheme({ palette: { text: { primary: "#674747", //dark gray - secondary: "#f9f3e3", //light cream - bg-color + secondary: "rgba(0, 0, 0, 0.28)", //light gray + + }, primary: { // green main: "#6fa128", //light green, - dark: "#f9f3e3" , + dark: "#f9f3e3", + light: "#f9f3e3" //light cream - bg-color }, secondary: { // purple/red main: "#782a33", From 02dbc44374a0e5c026f66992abbeb8bbb9397c60 Mon Sep 17 00:00:00 2001 From: Elena Volpato Date: Tue, 5 Sep 2023 18:05:27 +0200 Subject: [PATCH 3/5] fixed link color in AboutDialog component --- src/components/AboutDialog.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/AboutDialog.tsx b/src/components/AboutDialog.tsx index 3192238..9b3c677 100644 --- a/src/components/AboutDialog.tsx +++ b/src/components/AboutDialog.tsx @@ -21,9 +21,9 @@ export default function AboutDialog() { {t("AboutDialog_ItalyDisclaimer")} - {t("AboutDialog_aboutus")} fuzue.tech + {t("AboutDialog_aboutus")} fuzue.tech
- {t("AboutDialog_aboutapp")} here + {t("AboutDialog_aboutapp")} here From 60649da1c1fd5900c5b53f2096c3a1ca7834d300 Mon Sep 17 00:00:00 2001 From: Elena Volpato Date: Tue, 5 Sep 2023 18:07:44 +0200 Subject: [PATCH 4/5] fixed link color in contribuveDialog component --- src/components/ContributeDialog.tsx | 2 +- src/main.css | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/components/ContributeDialog.tsx b/src/components/ContributeDialog.tsx index 893d123..00d4738 100644 --- a/src/components/ContributeDialog.tsx +++ b/src/components/ContributeDialog.tsx @@ -14,7 +14,7 @@ export default function ContributeDialog() { {t("ContributeDialog_desc")}

{t("ContributeDialog_forthis")}  - + {t("ContributeDialog_githubPage")}

diff --git a/src/main.css b/src/main.css index 5dbb3f3..15fb8ec 100644 --- a/src/main.css +++ b/src/main.css @@ -1,7 +1,7 @@ html, body, #root, #root>div { height: 100%; margin: 0; - background-color: #eee; + background-color: #fefefe; overflow: hidden; } @@ -15,5 +15,5 @@ a { object-fit: cover; width: 100%; height: 100%; - //color: #074d6790 + color: #074d6790 } \ No newline at end of file From 9cf59b79de672b316e02ebedeb21076db930f4d0 Mon Sep 17 00:00:00 2001 From: Elena Volpato Date: Tue, 5 Sep 2023 18:08:45 +0200 Subject: [PATCH 5/5] fixed link color in contactDialog component --- src/components/ContactDialog.tsx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/components/ContactDialog.tsx b/src/components/ContactDialog.tsx index 09468cd..b562d96 100644 --- a/src/components/ContactDialog.tsx +++ b/src/components/ContactDialog.tsx @@ -17,14 +17,14 @@ export default function ContactDialog() { {t("ContactDialog_text1")} {t("ContactDialog_text2")} -  {t( "ContactDialog_text3")} {t("ContactDialog_text4")} +  {t( "ContactDialog_text3")} {t("ContactDialog_text4")} - contact@fuzue.tech + contact@fuzue.tech - GitHub Repo + GitHub Repo