diff --git a/src/components/profile/ProfileSidebarMenu/index.tsx b/src/components/profile/ProfileSidebarMenu/index.tsx index c01ead4c..dafbae33 100644 --- a/src/components/profile/ProfileSidebarMenu/index.tsx +++ b/src/components/profile/ProfileSidebarMenu/index.tsx @@ -7,18 +7,22 @@ interface IProps { path: string; } -const ProfileSidebarMenu: FC = ({ path }) => ( -
- - - Настройки - +const ProfileSidebarMenu: FC = ({ path }) => { + const cleaned = path.replace(/\/$/, ''); -
- - Сообщения + return ( +
+ + + Настройки + + +
+ + Сообщения +
-
-); + ); +}; export { ProfileSidebarMenu }; diff --git a/src/containers/sidebars/SidebarWrapper/index.tsx b/src/containers/sidebars/SidebarWrapper/index.tsx index 757d25e5..681488c4 100644 --- a/src/containers/sidebars/SidebarWrapper/index.tsx +++ b/src/containers/sidebars/SidebarWrapper/index.tsx @@ -23,6 +23,7 @@ const SidebarWrapper: FC = ({ children, onClose }) => { return createPortal(
+ {children}
, document.body diff --git a/src/containers/sidebars/SidebarWrapper/styles.module.scss b/src/containers/sidebars/SidebarWrapper/styles.module.scss index fe6b7def..520b64dc 100644 --- a/src/containers/sidebars/SidebarWrapper/styles.module.scss +++ b/src/containers/sidebars/SidebarWrapper/styles.module.scss @@ -20,19 +20,11 @@ overflow: hidden; animation: appear 0.25s forwards; - @include sidebar -} + @include sidebar; -.content { - height: 100%; - overflow: auto; - display: flex; - align-items: center; - justify-content: flex-end; - animation: slideIn 0.5s 0.1s forwards; - transform: translate(100%, 0); - position: relative; - z-index: 2; + & > * { + z-index: 4; + } } .clicker {