From 16580890882ecb672910900cb6f0bf52dd6db0cd Mon Sep 17 00:00:00 2001 From: Ihor Smyk Date: Mon, 26 Jun 2023 19:31:39 +0300 Subject: [PATCH 1/2] fix --- src/components/DefaultBoard/Default.module.scss | 13 +++++++++---- src/components/HelpWindow/HelpWindow.module.scss | 3 ++- src/components/Sidebar/Sidebar.module.scss | 5 +++++ src/index.scss | 3 ++- src/pages/HomePage.jsx | 6 +++--- 5 files changed, 21 insertions(+), 9 deletions(-) diff --git a/src/components/DefaultBoard/Default.module.scss b/src/components/DefaultBoard/Default.module.scss index 240f851..ebd6471 100644 --- a/src/components/DefaultBoard/Default.module.scss +++ b/src/components/DefaultBoard/Default.module.scss @@ -2,7 +2,8 @@ @import '../../assets/styles/mixins'; .BackGround { - height: 100vh; + height: calc(100vh - 60px); + &.dark { background-color: #1f1f1f; } @@ -18,7 +19,7 @@ align-items: center; justify-content: center; - height: 100%; + // height: 100%; } .DefaultTitle { font-weight: 400; @@ -26,8 +27,9 @@ line-height: 1.29; text-align: center; letter-spacing: -0.02em; - margin-left: auto; - margin-right: auto; + min-height: min-content; + // margin-left: auto; + // margin-right: auto; @include mobileSmall { max-width: 335px; @@ -37,6 +39,9 @@ } @include tablet { width: 486px; + .BackGround { + height: calc(100vh - 68px); + } } &.dark { color: #ffffff80; diff --git a/src/components/HelpWindow/HelpWindow.module.scss b/src/components/HelpWindow/HelpWindow.module.scss index a6a890a..14f9704 100644 --- a/src/components/HelpWindow/HelpWindow.module.scss +++ b/src/components/HelpWindow/HelpWindow.module.scss @@ -4,7 +4,8 @@ .container { width: 197px; height: 238px; - margin-top: 40px; + // margin-top: 40px; + margin-top: auto; background-color: $off-white-color; border-radius: 8px; padding: 14px; diff --git a/src/components/Sidebar/Sidebar.module.scss b/src/components/Sidebar/Sidebar.module.scss index 8de0f01..c9e2fe2 100644 --- a/src/components/Sidebar/Sidebar.module.scss +++ b/src/components/Sidebar/Sidebar.module.scss @@ -2,6 +2,7 @@ @import '../../assets/styles/mixins'; .container { width: 225px; + max-height: 100%; background-color: $white-color; padding: 14px 0 24px; @@ -39,6 +40,10 @@ // opacity: 0; // transition: opacity 0.3s ease-in; + + // &>div>div{ + // height: 100%; + // } } .text { diff --git a/src/index.scss b/src/index.scss index bb25e71..34e98e5 100644 --- a/src/index.scss +++ b/src/index.scss @@ -26,7 +26,8 @@ body { margin: 0; - + height: 100vh; + overflow: hidden; font-family: 'Poppins-Regular', sans-serif; -webkit-font-smoothing: antialiased; -moz-osx-font-smoothing: grayscale; diff --git a/src/pages/HomePage.jsx b/src/pages/HomePage.jsx index ca85b37..1ff3871 100644 --- a/src/pages/HomePage.jsx +++ b/src/pages/HomePage.jsx @@ -3,14 +3,14 @@ import { useMediaQuery } from 'react-responsive'; import { Outlet } from 'react-router-dom'; import { Sidebar } from '../components/Sidebar/Sidebar'; import { Header } from 'components/Header/Header'; -import { Container } from 'components/Container'; +// import { Container } from 'components/Container'; export const HomePage = () => { const isDesktopSize = useMediaQuery({ query: '(min-width: 1280px)' }); return (
- + {/* */}
{isDesktopSize && }
@@ -18,7 +18,7 @@ export const HomePage = () => {
- + {/* */}
); }; From fa134735748b4214a41474bd8523c0d7337932ec Mon Sep 17 00:00:00 2001 From: Ihor Smyk Date: Mon, 26 Jun 2023 20:29:39 +0300 Subject: [PATCH 2/2] fix bugs --- .../DefaultBoard/Default.module.scss | 20 +++++++++++-------- src/components/DefaultBoard/DefaultBoard.jsx | 4 ++-- src/index.scss | 2 +- 3 files changed, 15 insertions(+), 11 deletions(-) diff --git a/src/components/DefaultBoard/Default.module.scss b/src/components/DefaultBoard/Default.module.scss index ebd6471..52328b6 100644 --- a/src/components/DefaultBoard/Default.module.scss +++ b/src/components/DefaultBoard/Default.module.scss @@ -3,6 +3,7 @@ .BackGround { height: calc(100vh - 60px); + position: relative; &.dark { background-color: #1f1f1f; @@ -14,20 +15,23 @@ background-color: #ecedfd; } } -.Wrapper { - display: flex; - align-items: center; - justify-content: center; - - // height: 100%; -} +// .Wrapper { +// display: flex; +// align-items: center; +// justify-content: center; +// // height: 100% +// } .DefaultTitle { + position: absolute; + top: 50%; + left: 50%; + transform: translate(-50%, -50%); font-weight: 400; font-size: 14px; line-height: 1.29; text-align: center; letter-spacing: -0.02em; - min-height: min-content; + max-height: min-content; // margin-left: auto; // margin-right: auto; diff --git a/src/components/DefaultBoard/DefaultBoard.jsx b/src/components/DefaultBoard/DefaultBoard.jsx index 83bc833..00bc00d 100644 --- a/src/components/DefaultBoard/DefaultBoard.jsx +++ b/src/components/DefaultBoard/DefaultBoard.jsx @@ -11,7 +11,7 @@ export const DefaultDashBoard = () => { <>
-
+ {/*
*/}

Before starting your project, it is essential @@ -23,7 +23,7 @@ export const DefaultDashBoard = () => { effective collaboration among team members.

-
+ {/*
*/} ); }; diff --git a/src/index.scss b/src/index.scss index 34e98e5..34e2b97 100644 --- a/src/index.scss +++ b/src/index.scss @@ -27,7 +27,7 @@ body { margin: 0; height: 100vh; - overflow: hidden; + // overflow: hidden; font-family: 'Poppins-Regular', sans-serif; -webkit-font-smoothing: antialiased; -moz-osx-font-smoothing: grayscale;