diff --git a/src/s2-homeworks/hw01/Message.module.css b/src/s2-homeworks/hw01/Message.module.css index 7accfea..cac937a 100644 --- a/src/s2-homeworks/hw01/Message.module.css +++ b/src/s2-homeworks/hw01/Message.module.css @@ -70,6 +70,7 @@ margin-right: 20px; padding: 7px 25px 8px 13px; border-radius: 10px; + z-index: -1; } .messageText:after { @@ -96,6 +97,7 @@ margin-left: 20px; padding: 7px 25px 8px 13px; border-radius: 10px; + z-index: -1; } .friendMessageText:after { diff --git a/src/s2-homeworks/hw05/header/Header.module.css b/src/s2-homeworks/hw05/header/Header.module.css index 66d6719..c9ee04d 100644 --- a/src/s2-homeworks/hw05/header/Header.module.css +++ b/src/s2-homeworks/hw05/header/Header.module.css @@ -9,9 +9,19 @@ background: #fff; box-shadow: 0 0 40px rgba(29, 33, 38, 0.13), 0 0 2px rgba(29, 33, 38, 0.1); display: flex; + justify-content: space-between; height: var(--header_height); padding: 0 70px; position: sticky; top: 0; width: 100%; } + +.header h1 { + font-family: 'Montserrat', sans-serif; + font-weight: 600; + font-size: 24px; + line-height: 29px; + + color: #000000; +} \ No newline at end of file diff --git a/src/s2-homeworks/hw05/header/Header.tsx b/src/s2-homeworks/hw05/header/Header.tsx index c739fd0..a64b6f2 100644 --- a/src/s2-homeworks/hw05/header/Header.tsx +++ b/src/s2-homeworks/hw05/header/Header.tsx @@ -1,14 +1,25 @@ import React, { FC } from 'react' import burgerIcon from './burger.svg' import s from './Header.module.css' +import { useLocation } from 'react-router-dom' +import { PATH } from '../Pages' type PropsType = { - open: boolean handleOpen: () => void } -export const Header: FC = ({ open, handleOpen }) => { +export const Header: FC = ({ handleOpen }) => { // hw5-menu изначально отсутствует, при нажатии на бургер - появляется, при повторном нажатии исчезает + const location = useLocation() + const currentPath = location.pathname + const pageName = + currentPath === PATH.PRE_JUNIOR + ? 'Pre Junior' + : currentPath === PATH.JUNIOR + ? 'Junior' + : currentPath === PATH.JUNIOR_PLUS + ? 'Junior Plus' + : 'Error' return ( <>
@@ -19,6 +30,7 @@ export const Header: FC = ({ open, handleOpen }) => { onClick={handleOpen} alt={'open menu'} /> +

{pageName}

) diff --git a/src/s2-homeworks/hw05/sidebar/Sidebar.module.css b/src/s2-homeworks/hw05/sidebar/Sidebar.module.css index e712910..6d6c060 100644 --- a/src/s2-homeworks/hw05/sidebar/Sidebar.module.css +++ b/src/s2-homeworks/hw05/sidebar/Sidebar.module.css @@ -8,7 +8,7 @@ top: 0; transition: 0.2s ease-in; width: 317px; - z-index: 2; + z-index: 20; } .sidebar.open { @@ -27,7 +27,7 @@ position: fixed; right: 0; top: 0; - z-index: 1; + z-index: 10; } .nav { @@ -54,8 +54,8 @@ .nav a.active { color: #0059b2; + text-decoration: underline; } - .close { background-color: transparent; border: none;