diff --git a/front/.env.development b/front/.env.development index 92fc50d..9ce34ba 100644 --- a/front/.env.development +++ b/front/.env.development @@ -1 +1 @@ -NEXTAUTH_URL=http://localhost:3000 +NEXTAUTH_URL=http://localhost:3016 diff --git a/front/public/main-logo.svg b/front/public/main-logo.svg new file mode 100644 index 0000000..2f66e50 --- /dev/null +++ b/front/public/main-logo.svg @@ -0,0 +1,31 @@ + + + + + + + + + + diff --git a/front/src/modules/auth/components/sign-out-button/sign-out-button.component.tsx b/front/src/modules/auth/components/sign-out-button/sign-out-button.component.tsx index 103cc0a..bbd1ae2 100644 --- a/front/src/modules/auth/components/sign-out-button/sign-out-button.component.tsx +++ b/front/src/modules/auth/components/sign-out-button/sign-out-button.component.tsx @@ -3,7 +3,10 @@ import styles from "./sign-out-button.module.scss"; export const SignOutButton = () => { return ( - ); diff --git a/front/src/modules/auth/components/user-dropdown/user-dropdown.module.scss b/front/src/modules/auth/components/user-dropdown/user-dropdown.module.scss index 772baae..716371a 100644 --- a/front/src/modules/auth/components/user-dropdown/user-dropdown.module.scss +++ b/front/src/modules/auth/components/user-dropdown/user-dropdown.module.scss @@ -3,11 +3,10 @@ overflow: visible; .avatar__container { - width: 6rem; - height: 6rem; + height: var(--header-item-height, 4rem); + width: var(--header-item-height, 4rem); - font-size: 3.4rem; - padding: 0.5rem; + font-size: 3.2rem; } .dropdown__container { diff --git a/front/src/modules/auth/components/user-frame/user-frame.module.scss b/front/src/modules/auth/components/user-frame/user-frame.module.scss index ced634d..f48a76a 100644 --- a/front/src/modules/auth/components/user-frame/user-frame.module.scss +++ b/front/src/modules/auth/components/user-frame/user-frame.module.scss @@ -7,7 +7,7 @@ border-radius: 50%; overflow: hidden; - border: 1px solid var(--color-grey-30); + box-shadow: 1px 1px 3px var(--color-grey-30); box-sizing: border-box; & > span { diff --git a/front/src/modules/auth/components/user-panel/user-panel.module.scss b/front/src/modules/auth/components/user-panel/user-panel.module.scss index b6b0abd..4b8f4aa 100644 --- a/front/src/modules/auth/components/user-panel/user-panel.module.scss +++ b/front/src/modules/auth/components/user-panel/user-panel.module.scss @@ -8,9 +8,12 @@ padding: 1.2rem 1.8rem; border-radius: 6px; - background-color: var(--color-foreground); + background-color: var(--color-white); + box-shadow: 0 2px 3px rgba(var(--color-grey-10-rgb), 0.2); color: var(--color-background); + z-index: 10; + & .user { font-size: 1.6rem; diff --git a/front/src/modules/common/components/navbar-header/navbar-header.component.tsx b/front/src/modules/common/components/navbar-header/navbar-header.component.tsx index af0e8b4..01440ec 100644 --- a/front/src/modules/common/components/navbar-header/navbar-header.component.tsx +++ b/front/src/modules/common/components/navbar-header/navbar-header.component.tsx @@ -10,7 +10,8 @@ export const NavbarHeader = (props: PropsWithChildren) => { return (
- LoGo + +

Your brand

diff --git a/front/src/modules/common/components/navbar-header/navbar-header.module.scss b/front/src/modules/common/components/navbar-header/navbar-header.module.scss index 155b91e..ca86ea6 100644 --- a/front/src/modules/common/components/navbar-header/navbar-header.module.scss +++ b/front/src/modules/common/components/navbar-header/navbar-header.module.scss @@ -10,16 +10,37 @@ box-sizing: border-box; border-radius: 8px; - padding: 0.4rem 1.8rem; + padding: 0.6rem 2rem; background-color: var(--color-white); box-shadow: 0 1px 3px rgba(var(--color-grey-10-rgb), 0.3); color: var(--color-background); + --header-item-height: 4.5rem; + .logo { display: flex; + flex-direction: row; + gap: 0.6rem; align-items: center; font-size: 2.6rem; font-weight: bold; + + height: var(--header-item-height); + width: auto; + + & > img { + height: 100%; + width: 100%; + object-fit: contain; + } + + & > h1 { + font-size: 1.4rem; + } + } + + & > nav { + display: flex; } } diff --git a/front/src/styles/main.scss b/front/src/styles/main.scss index b2b5df3..9bbdb54 100644 --- a/front/src/styles/main.scss +++ b/front/src/styles/main.scss @@ -89,8 +89,8 @@ html { body { box-sizing: border-box; - background-color: var(--color-background); - color: var(--color-foreground); + background-color: var(--color-white); + color: var(--color-black); } a {