diff --git a/packages/client/src/app/App.scss b/packages/client/src/app/App.scss deleted file mode 100644 index ec75296..0000000 --- a/packages/client/src/app/App.scss +++ /dev/null @@ -1 +0,0 @@ -@import '../scss/vars.scss'; diff --git a/packages/client/src/app/App.tsx b/packages/client/src/app/App.tsx index 0f22150..dae0732 100644 --- a/packages/client/src/app/App.tsx +++ b/packages/client/src/app/App.tsx @@ -1,6 +1,3 @@ -// import { useEffect } from 'react' - -import '@/app/App.scss' import AuthLayout from '@/layouts/AuthLayout/AuthLayout' import PrivateLayout from '@/layouts/PrivateLayout/PrivateLayout' import PublicLayout from '@/layouts/PublicLayout/PublicLayout' diff --git a/packages/client/src/components/common/Header/Header.scss b/packages/client/src/components/common/Header/Header.scss index e29d410..f32ad3b 100644 --- a/packages/client/src/components/common/Header/Header.scss +++ b/packages/client/src/components/common/Header/Header.scss @@ -1,43 +1,41 @@ @import '../../../scss/vars'; .main-header { - &__container { - display: flex; - } - - &__logo-block { - margin-right: auto; - } + &__container { + display: flex; + justify-content: space-between; + } } .logo-block { - user-select: none; + user-select: none; - &__image { - width: 114px; - margin-bottom: -62px; - } + &__image { + width: 114px; + margin-bottom: -62px; + } } .main-nav { - display: flex; - gap: $nav_list-gap; - padding: $nav_list-padding-y $nav_list-padding-x; - - &__link { - font-size: $nav_link-font-size; - font-weight: $nav_link-font-weight; - letter-spacing: 1px; - - text-shadow: $main-text-shadow; - text-transform: uppercase; - text-decoration: none; - - color: #fff; - transition: color $animation-base-speed; - - &:hover, &_active { - color: $primary-color; - } + display: flex; + gap: $nav_list-gap; + padding: $nav_list-padding-y $nav_list-padding-x; + + &__link { + font-size: $nav_link-font-size; + font-weight: $nav_link-font-weight; + letter-spacing: 1px; + + text-shadow: $main-text-shadow; + text-transform: uppercase; + text-decoration: none; + + color: $text-color; + transition: color $animation-base-speed; + + &:hover, + &_active { + color: $primary-color; } -} \ No newline at end of file + } +} diff --git a/packages/client/src/components/common/Header/Header.tsx b/packages/client/src/components/common/Header/Header.tsx index f7072f4..8b71340 100644 --- a/packages/client/src/components/common/Header/Header.tsx +++ b/packages/client/src/components/common/Header/Header.tsx @@ -8,8 +8,8 @@ type HeaderProps = { export const Header = (props: HeaderProps) => { const { className = '' } = props - const isActiveNavLink = (isActive: boolean) => - isActive ? 'main-nav__link main-nav__link_active' : 'main-nav__link'; + const getNavLinkClassName = (isActive: boolean) => + isActive ? 'main-nav__link main-nav__link_active' : 'main-nav__link' return (
@@ -26,22 +26,22 @@ export const Header = (props: HeaderProps) => {