Merge pull request #1223 from Real-Dev-Squad/develop

Dev to Main Sync - fix design of the Task request modal
Real-Dev-Squad · Jul 21, 2024 · 414b005 · 414b005
2 parents 5514543 + bc0652c
commit 414b005
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 9 deletions.
diff --git a/public/cancel-icon.svg b/public/cancel-icon.svg
diff --git a/src/components/MarkDownEditor/MarkDownEditor.tsx b/src/components/MarkDownEditor/MarkDownEditor.tsx
@@ -1,6 +1,7 @@
 import PropTypes from 'prop-types';
 import { ChangeEvent, useState } from 'react';
 import Markdown from 'markdown-to-jsx';
+import styles from '@/components/issues/Card.module.scss';
 
 interface MarkDownEditorProps {
     onChange?: (e: ChangeEvent<HTMLTextAreaElement>) => void;
@@ -41,7 +42,7 @@ const MarkDownEditor: React.FC<MarkDownEditorProps> = ({
                     {getActivePaneLabel()}
                 </button>
             </div>
-            <div className="markdown-editor">
+            <div className={styles.markdown__spacing}>
                 {mode === 'description' && (
                     <div className="description-box">
                         <textarea

diff --git a/src/components/issues/Card.module.scss b/src/components/issues/Card.module.scss
@@ -78,13 +78,16 @@
     flex-direction: column;
     gap: 1rem;
 }
+.request_spacing {
+    margin-top: 1rem;
+}
 .modalCloseIcon {
     appearance: none;
     background-color: transparent;
     border: none;
     position: absolute;
-    right: -24px;
-    top: -18px;
+    right: 10px;
+    top: 10px;
     cursor: pointer;
 }
 .trackMessage {
@@ -267,10 +270,6 @@
 .card__top__button {
     @include styles.issues-button;
     min-width: 9rem;
-
-    @media (max-width: 48rem) {
-        margin-top: 1rem;
-    }
 }
 
 .card__issue_created__by,
@@ -288,6 +287,10 @@
     }
 }
 
+.markdown__spacing {
+    margin-top: 0.5rem;
+}
+
 .card__link {
     font-family: 'Inter';
     font-style: normal;

diff --git a/src/components/issues/TaskRequestForm.tsx b/src/components/issues/TaskRequestForm.tsx
@@ -178,7 +178,9 @@ const TaskRequestForm: FC<ActionFormProps> = ({
                 </div>
             </div>
             {isLoading && <Loader />}
-            <div className={styles.form_container}>
+            <div
+                className={`${styles.form_container} ${styles.request_spacing}`}
+            >
                 <button
                     className={styles.card__top__button}
                     type="submit"