diff --git a/client/public/index_style.css b/client/public/index_style.css index 7ddbff5..7b7d712 100644 --- a/client/public/index_style.css +++ b/client/public/index_style.css @@ -5,7 +5,7 @@ --secondary: var(--secondary-400); --accent: var(--accent-600); - --line: var(--text-100); + --line: var(--accent-200); /* alt-bg is secondary-300 with 0.35 opacity */ --alt-bg: var(--secondary-200); --info-card-bg: var(--secondary-100); diff --git a/client/public/logo192.png b/client/public/logo192.png deleted file mode 100644 index fc44b0a..0000000 Binary files a/client/public/logo192.png and /dev/null differ diff --git a/client/public/logo512.png b/client/public/logo512.png deleted file mode 100644 index a4e47a6..0000000 Binary files a/client/public/logo512.png and /dev/null differ diff --git a/client/src/components/Navbar.tsx b/client/src/components/Navbar.tsx index b0003ad..a7316c2 100644 --- a/client/src/components/Navbar.tsx +++ b/client/src/components/Navbar.tsx @@ -10,7 +10,10 @@ import { useLocation } from "react-router-dom" import { useEffect } from "react" import { useToast } from "../utils/ToastContext" -import logo from "../logo.png" +// import logo from "../logo.png" +// import svgLogo from "../logo.svg" + +import { SVGLogo } from "./SVGIcons" const Navbar: React.FC = ({isLogged, profile, siteName, onLogout}) => { const navigate = useNavigate(); @@ -145,7 +148,10 @@ const Navbar: React.FC = ({isLogged, profile, siteName, onLogout})
navigate("/home")}> - GoTogether + {/* GoTogether */} + {/* GoTogether */} + +
{window.screen.width>window.screen.height || !isLogged?"GoTogether":"GoTo"} diff --git a/client/src/components/SVGIcons.tsx b/client/src/components/SVGIcons.tsx index 047e187..6e243cd 100644 --- a/client/src/components/SVGIcons.tsx +++ b/client/src/components/SVGIcons.tsx @@ -81,4 +81,192 @@ export function SVGTime({ width = "32", height = "32", fill = "currentColor", cs ) +} + +export function SVGLogo({ width = "32", height = "32", fill = "currentColor", cssClass = ""}: SVGIconProps){ + return( + + + + ) } \ No newline at end of file diff --git a/client/src/logo.png b/client/src/logo.png deleted file mode 100644 index 3957582..0000000 Binary files a/client/src/logo.png and /dev/null differ diff --git a/client/src/styles/footer.css b/client/src/styles/footer.css index 1d33b36..2f4e700 100644 --- a/client/src/styles/footer.css +++ b/client/src/styles/footer.css @@ -1,5 +1,5 @@ footer { - padding: 1rem 8rem; + padding: 1rem 10rem; /* padding-top: 4rem; */ margin-top: auto ; display: flex; @@ -123,4 +123,12 @@ h4 { .user-trips{ padding: 0.4rem; } + + .navbar__left{ + gap: 0.5rem; + } + + .navbar{ + padding: 0.7rem 1.3rem; + } } diff --git a/client/src/styles/navbarStyle.css b/client/src/styles/navbarStyle.css index 085af64..1c48fcd 100644 --- a/client/src/styles/navbarStyle.css +++ b/client/src/styles/navbarStyle.css @@ -2,7 +2,7 @@ display: flex; justify-content: space-between; align-items: center; - padding: 10px 20px; + padding: 0.8rem 3rem; border-bottom: 1px solid var(--line); } @@ -11,7 +11,7 @@ font-weight: bold; background-color: var(--text); - background-image: linear-gradient(120deg, var(--primary), var(--accent)); + background-image: linear-gradient(120deg, var(--accent), var(--primary)); background-size: 100%; background-repeat: repeat; -webkit-background-clip: text; @@ -37,7 +37,7 @@ } .navbar__site-name:hover{ - background-image: linear-gradient(240deg, var(--primary), var(--accent)); + background-image: linear-gradient(240deg, var(--accent), var(--primary)); } .navbar__user {