Merge branch 'raaynoff'

RaayNoff · Sep 4, 2022 · 435addc · 435addc
2 parents a4c5768 + 776b538
commit 435addc
Show file tree

Hide file tree

Showing 11 changed files with 30 additions and 7 deletions.
diff --git 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
@@ -22,6 +22,7 @@ const CommentaryArea: FC<ICommentaryAreaProps> = ({ 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
@@ -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
@@ -24,7 +24,7 @@ const DatePick: FC<IDatePick> = ({ timestampCallback }) => {
     <section className={s.datepicker}>
       <section className={s.datepicker__label}>
         <div className={s.datepicker__box}></div>
-        <p className={s.datepicker__endtime}>Срок&nbsp;выполнения:</p>
+        <p className={s.datepicker__endtime}>Срок выполнения:</p>
       </section>
       <DatePicker
         wrapperClassName={s.picker}

diff --git a/src/components/UI/grouper/grouper.module.scss b/src/components/UI/grouper/grouper.module.scss
@@ -45,6 +45,7 @@
 
 	// .grouper__add
 	&__add {
+		transform: scale(1.3);
 		@media (min-width: 991.98px) {
 			&:hover {
 				background-color: #eeeeee;

diff --git a/src/components/UI/headerInsert/headerInsert.module.scss b/src/components/UI/headerInsert/headerInsert.module.scss
@@ -1,8 +1,8 @@
 .headerInsert {
 	background: #f7f7f7;
 	border-radius: 10px 10px 0px 0px;
-	max-height: 55px;
-	height: 45px;
+	max-height: 45px;
+	min-height: 45px;
 	border-bottom: 2px solid #e0e0e0;
 	width: 100%;
 }

diff --git a/src/components/UI/list/additional/listMenu.tsx b/src/components/UI/list/additional/listMenu.tsx
@@ -19,7 +19,7 @@ const ListMenu: FC<IListMenuProps> = ({
   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
@@ -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
@@ -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
@@ -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
@@ -15,7 +15,7 @@
 
 	@media (max-width: 991.98px) {
 		align-items: flex-start;
-		padding-top: 113px;
+		padding-top: 20px;
 	}
 }
 .popup.enabled {