diff --git a/src/components/Modal/Tracker/ModalTicket/modalTicket.scss b/src/components/Modal/Tracker/ModalTicket/modalTicket.scss index 600e219e..902dbb77 100644 --- a/src/components/Modal/Tracker/ModalTicket/modalTicket.scss +++ b/src/components/Modal/Tracker/ModalTicket/modalTicket.scss @@ -746,6 +746,11 @@ top: 10px !important; left: -110px !important; z-index: 10; + + @media (max-width: 880px) { + left: 0 !important; + top: -15px !important; + } } .react-datepicker__current-month { diff --git a/src/components/Modal/Tracker/TicketFullScreen/TicketFullScreen.jsx b/src/components/Modal/Tracker/TicketFullScreen/TicketFullScreen.jsx index 2b5dbce3..5d0aa341 100644 --- a/src/components/Modal/Tracker/TicketFullScreen/TicketFullScreen.jsx +++ b/src/components/Modal/Tracker/TicketFullScreen/TicketFullScreen.jsx @@ -479,7 +479,7 @@ export const TicketFullScreen = () => {
{ )}
- Создатель :
- {taskInfo.user?.fio}
+ Создатель :
{taskInfo.user?.fio}
{taskInfo.executor ? ( diff --git a/src/components/Modal/Tracker/TicketFullScreen/ticketFullScreen.scss b/src/components/Modal/Tracker/TicketFullScreen/ticketFullScreen.scss index d84f8b65..deda6c7f 100644 --- a/src/components/Modal/Tracker/TicketFullScreen/ticketFullScreen.scss +++ b/src/components/Modal/Tracker/TicketFullScreen/ticketFullScreen.scss @@ -8,6 +8,112 @@ &-whith { width: 850px !important; + + @media (max-width: 1190px) { + width: auto !important; + margin: 0 !important; + } + } + + @media (max-width: 880px) { + flex-direction: column !important; + } +} + +.fullScreenWorkers { + @media (max-width: 880px) { + background: #DFF1FF; + + .workers_box { + @media (max-width: 880px) { + flex-direction: inherit !important; + align-items: center; + flex-wrap: wrap; + gap: 10px; + padding: 10px 18px !important; + + .workers__creator { + margin-bottom: 0 !important; + display: flex; + + } + + .add-worker { + margin: 0 !important; + } + + .executor { + p { + max-width: none !important; + } + } + } + } + + .workers_box-middle { + padding: 0 10px !important; + display: flex; + flex-wrap: wrap; + align-items: center; + gap: 20px; + border-bottom: none !important; + + .deadLine { + width: 100%; + } + + .start { + margin-top: 0 !important; + order: 2; + } + + .time { + margin-top: 0; + order: 3; + } + } + + .workers_box-bottom { + display: flex; + flex-wrap: wrap; + gap: 10px; + padding: 10px !important; + + div { + width: 145px; + } + } + } +} + +.commentFullScreen { + @media (max-width: 520px) { + width: auto !important; + } +} + +.filesFullScreen { + @media (max-width: 520px) { + justify-content: space-evenly; + max-height: 400px !important; + } +} + +.comments__list__item { + @media (max-width: 520px) { + padding: 0 !important; + } +} + +.nameFullScreen { + @media (max-width: 520px) { + white-space: inherit !important; + } +} + +.fullScreenDescription { + @media (max-width: 1190px) { + white-space: inherit !important; } } diff --git a/src/components/TrackerSelectColumn/TrackerSelectColumn.jsx b/src/components/TrackerSelectColumn/TrackerSelectColumn.jsx index 3fd9fcab..bba1e559 100644 --- a/src/components/TrackerSelectColumn/TrackerSelectColumn.jsx +++ b/src/components/TrackerSelectColumn/TrackerSelectColumn.jsx @@ -15,7 +15,7 @@ export const TrackerSelectColumn = ({ columns, task, currentColumn }) => { className="trackerSelectColumn" onClick={() => setOpenSelect(!openSelect)} > -Выберите колонку
+{currentColumn.title}
{openSelect && ({task.title}
@@ -690,7 +699,7 @@ export const ProjectTracker = () => { columns={projectBoard.columns.filter( (item) => item.id !== column.id )} - currentColumn={column.id} + currentColumn={column} task={task} />