diff --git a/src/components/UI/commentaryArea/commentaryArea.module.scss b/src/components/UI/commentaryArea/commentaryArea.module.scss index 6d5e3cb..2d54c26 100644 --- a/src/components/UI/commentaryArea/commentaryArea.module.scss +++ b/src/components/UI/commentaryArea/commentaryArea.module.scss @@ -1,5 +1,6 @@ .commentaryArea { margin-top: 30px; + margin-bottom: 30px; display: flex; flex-direction: column; border-radius: 5px; diff --git a/src/components/UI/commentaryArea/index.tsx b/src/components/UI/commentaryArea/index.tsx index bebae9a..b3aebc3 100644 --- a/src/components/UI/commentaryArea/index.tsx +++ b/src/components/UI/commentaryArea/index.tsx @@ -22,6 +22,7 @@ const CommentaryArea: FC = ({ taskId }) => { userEmail: user.email || "", timestamp: DateApi.getNowTimestamp(), }); + setText(""); }; return ( diff --git a/src/components/UI/datePick/datePick.module.scss b/src/components/UI/datePick/datePick.module.scss index 1eb1c41..cf54ea5 100644 --- a/src/components/UI/datePick/datePick.module.scss +++ b/src/components/UI/datePick/datePick.module.scss @@ -23,6 +23,7 @@ font-size: 12px; line-height: 14 / 12 * 100%; font-weight: 400; + white-space: nowrap; } } .picker { diff --git a/src/components/UI/datePick/index.tsx b/src/components/UI/datePick/index.tsx index 768bcba..95c8e75 100644 --- a/src/components/UI/datePick/index.tsx +++ b/src/components/UI/datePick/index.tsx @@ -24,7 +24,7 @@ const DatePick: FC = ({ timestampCallback }) => {
-

Срок выполнения:

+

Срок выполнения:

= ({ setIsEnabled, menuPosition, }) => { - const menuRef = useMenuPositionRef(menuPosition, 150, 15); + const menuRef = useMenuPositionRef(menuPosition, 110, 15); const [deleteList] = contentApi.useFetchListsDeleteMutation(); const { listDelete } = useActions(); const { shareListToggleOn, editListToggleOn } = useActions(); diff --git a/src/components/common/homeContent/additional/viewTemplate.module.scss b/src/components/common/homeContent/additional/viewTemplate.module.scss index 1ddfd9d..49f9785 100644 --- a/src/components/common/homeContent/additional/viewTemplate.module.scss +++ b/src/components/common/homeContent/additional/viewTemplate.module.scss @@ -29,8 +29,8 @@ overflow: scroll; overflow-y: scroll; overflow-x: hidden; - max-height: 75vh; scrollbar-width: 0px; + max-height: 70vh; &::-webkit-scrollbar { width: 0px; diff --git a/src/components/modals/taskInfo/additional/aside.module.scss b/src/components/modals/taskInfo/additional/aside.module.scss index 78fed65..ef0f45e 100644 --- a/src/components/modals/taskInfo/additional/aside.module.scss +++ b/src/components/modals/taskInfo/additional/aside.module.scss @@ -3,8 +3,9 @@ display: none; } width: 197px; + background: rgba(231, 231, 231, 0.5); - min-height: 100%; + height: 575px; padding: 20px 0px 0px 15px; border-radius: 0px 0px 10px 0px; diff --git a/src/components/modals/taskInfo/taskInfo.module.scss b/src/components/modals/taskInfo/taskInfo.module.scss index cdd4905..7282009 100644 --- a/src/components/modals/taskInfo/taskInfo.module.scss +++ b/src/components/modals/taskInfo/taskInfo.module.scss @@ -2,10 +2,18 @@ display: flex; flex-direction: column; + height: 620px; width: 670px; background-color: #fff; border-radius: 10px; + scrollbar-width: 0px; + + &::-webkit-scrollbar { + position: absolute; + width: 0px; + } + @media (max-width: 681px) { width: 460px; } @@ -24,10 +32,20 @@ // .taskInfo__dat &__data { width: 473px; + height: 575px; + overflow-y: auto; display: flex; flex-direction: column; margin: 0px 0px 25px 25px; + .wrapper::-webkit-scrollbar-track-piece:start { + margin-top: 10px; + height: 100px; + } + &::-webkit-scrollbar:horizontal { + height: 100px; + } + @media (max-width: 681px) { width: 460px; } diff --git a/src/scss/lib/reusable.scss b/src/scss/lib/reusable.scss index df7b770..d1bef91 100644 --- a/src/scss/lib/reusable.scss +++ b/src/scss/lib/reusable.scss @@ -15,7 +15,7 @@ @media (max-width: 991.98px) { align-items: flex-start; - padding-top: 113px; + padding-top: 20px; } } .popup.enabled {