From 07d1863ac84289ad63c9451a152edbdd5102f89a Mon Sep 17 00:00:00 2001 From: ttpl-rt-217 Date: Tue, 1 Oct 2024 11:29:22 +0530 Subject: [PATCH 1/3] Task #PS-1656 : UI improvements --- src/components/CohortSelectionSection.tsx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/components/CohortSelectionSection.tsx b/src/components/CohortSelectionSection.tsx index c8b41a9f..877c4fa1 100644 --- a/src/components/CohortSelectionSection.tsx +++ b/src/components/CohortSelectionSection.tsx @@ -419,7 +419,7 @@ const CohortSelectionSection: React.FC = ({ width: '100%', marginBottom: '0rem', '@media (max-width: 900px)': { - width: isAttendanceOverview ? '100%' : '50%', + width: isAttendanceOverview ? '100%' : '62%', }, }} MenuProps={{ @@ -517,12 +517,12 @@ const CohortSelectionSection: React.FC = ({ '@media (max-width: 902px)': { width: isAttendanceOverview ? '100%' - : '60%', + : '62%', }, '@media (max-width: 702px)': { width: isAttendanceOverview ? '100%' - : '50%', + : '65%', }, } } From 6dcee8a8291d6e165737be687b85fffba3fe458a Mon Sep 17 00:00:00 2001 From: ttpl-rt-217 Date: Thu, 3 Oct 2024 11:30:31 +0530 Subject: [PATCH 2/3] Task #PS-1656 : UI improvements --- src/pages/centers/[cohortId]/index.tsx | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/pages/centers/[cohortId]/index.tsx b/src/pages/centers/[cohortId]/index.tsx index d2270c72..2fa0ab72 100644 --- a/src/pages/centers/[cohortId]/index.tsx +++ b/src/pages/centers/[cohortId]/index.tsx @@ -619,15 +619,15 @@ const CohortPage = () => { type: 'fraction', }} breakpoints={{ - 500: { + 600: { slidesPerView: 1, spaceBetween: 20, }, - 740: { + 900: { slidesPerView: 2, spaceBetween: 20, }, - 900: { + 1200: { slidesPerView: 3, spaceBetween: 30, }, @@ -725,7 +725,7 @@ const CohortPage = () => { {sessions?.map((item) => ( - + Date: Thu, 3 Oct 2024 23:43:29 +0530 Subject: [PATCH 3/3] Task #PS-2128: Handle Large text translations like Malayalam language --- public/locales/en/common.json | 3 +- src/components/FacilitatorDrawer.tsx | 6 ++-- src/components/LearnerModal.tsx | 3 ++ .../board-enrollment/student-detail/index.tsx | 8 +++-- src/pages/centers/[cohortId]/index.tsx | 4 +-- src/pages/centers/index.tsx | 32 +++++++++---------- src/pages/course-planner-detail.tsx | 4 +-- src/pages/learner/[userId].tsx | 10 +++--- src/pages/user-profile/[userId].tsx | 7 ++-- 9 files changed, 44 insertions(+), 33 deletions(-) diff --git a/public/locales/en/common.json b/public/locales/en/common.json index 98112d4a..ece26602 100644 --- a/public/locales/en/common.json +++ b/public/locales/en/common.json @@ -578,6 +578,7 @@ "SAVE_AND_NEXT": "Save and Next", "TO_SAVE_YOUR_PROGRESS": "“Save & Next” to save your progress. You can come back and change it anytime.", "MANDATORY": "Mandatory for {{FeesStepBoards}} only. For other Boards, this step is automatically marked completed. Please click on Save to submit the data.", - "COMPLETED": "Completed" + "COMPLETED": "Completed", + "MARK_AS_COMPLETE":"Mark as Complete" } } diff --git a/src/components/FacilitatorDrawer.tsx b/src/components/FacilitatorDrawer.tsx index df7162d7..7cbc961c 100644 --- a/src/components/FacilitatorDrawer.tsx +++ b/src/components/FacilitatorDrawer.tsx @@ -91,7 +91,8 @@ const FacilitatorDrawer: React.FC = ({ sx={{ border: `1px solid ${theme?.palette?.warning['A400']}`, color: theme?.palette?.warning['A400'], - width: '121px', + width: 'fit-content', + px: '20px', }} variant="outlined" > @@ -105,7 +106,8 @@ const FacilitatorDrawer: React.FC = ({ variant="contained" color="primary" onClick={onPrimaryClick} - sx={{ width: '199px' }} + sx={{ width: 'fit-content', px: '20px' }} + className="one-line-text" > {primary} diff --git a/src/components/LearnerModal.tsx b/src/components/LearnerModal.tsx index 3ce331ef..2dd71092 100644 --- a/src/components/LearnerModal.tsx +++ b/src/components/LearnerModal.tsx @@ -211,6 +211,7 @@ const LearnerModal = ({ diff --git a/src/pages/board-enrollment/student-detail/index.tsx b/src/pages/board-enrollment/student-detail/index.tsx index a6e09958..60bf738c 100644 --- a/src/pages/board-enrollment/student-detail/index.tsx +++ b/src/pages/board-enrollment/student-detail/index.tsx @@ -393,8 +393,10 @@ const BoardEnrollmentDetail = () => { }, border: `1px solid ${theme.palette.error.contrastText}`, mt: '15px', - width: '144px', + width: 'fit-content', + px: '20px', }} + className="one-line-text" variant="outlined" onClick={handleBack} disabled={activeStep === 0} @@ -403,12 +405,14 @@ const BoardEnrollmentDetail = () => {