From 5b928b947a8fa5d76cec65b1d2203533d6ddd256 Mon Sep 17 00:00:00 2001 From: Cadecraft Date: Tue, 26 Nov 2024 21:23:34 -0800 Subject: [PATCH 1/5] initial style consistency --- site/src/pages/RoadmapPage/Transfer.tsx | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/site/src/pages/RoadmapPage/Transfer.tsx b/site/src/pages/RoadmapPage/Transfer.tsx index 4e145770..7cd406f5 100644 --- a/site/src/pages/RoadmapPage/Transfer.tsx +++ b/site/src/pages/RoadmapPage/Transfer.tsx @@ -45,13 +45,13 @@ const TransferEntry: FC = (props) => { return ( - + dispatch(deleteTransfer(props.index))} /> - + setName(e.target.value)} /> - + = ({ missingPrereqNames }) => { }; return ( - - - Transfer Credits + + +

Transfer Credits

- +

Record your AP Credits or Community College Credits here. Doing so will clear the prerequisites on the roadmap. @@ -100,7 +100,7 @@ const Transfer: FC = ({ missingPrereqNames }) => { )} -

+ {transfers.map((transfer, i) => ( ))} From 3806be1d8d8805efe2221b865dc4c4134d59c961 Mon Sep 17 00:00:00 2001 From: Cadecraft Date: Sat, 30 Nov 2024 12:10:18 -0800 Subject: [PATCH 2/5] transfer modal column widths adjust --- site/src/pages/RoadmapPage/Transfer.tsx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/site/src/pages/RoadmapPage/Transfer.tsx b/site/src/pages/RoadmapPage/Transfer.tsx index 7cd406f5..86fe2c0a 100644 --- a/site/src/pages/RoadmapPage/Transfer.tsx +++ b/site/src/pages/RoadmapPage/Transfer.tsx @@ -45,13 +45,13 @@ const TransferEntry: FC = (props) => { return ( - + dispatch(deleteTransfer(props.index))} /> - + setName(e.target.value)} /> - + Date: Sun, 1 Dec 2024 09:11:06 -0800 Subject: [PATCH 3/5] transfer modal width and font size --- site/src/pages/RoadmapPage/Transfer.scss | 15 +++++++++++++-- site/src/pages/RoadmapPage/Transfer.tsx | 4 ++-- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/site/src/pages/RoadmapPage/Transfer.scss b/site/src/pages/RoadmapPage/Transfer.scss index c16ce832..9b0ae774 100644 --- a/site/src/pages/RoadmapPage/Transfer.scss +++ b/site/src/pages/RoadmapPage/Transfer.scss @@ -6,7 +6,8 @@ border-top-color: var(--overlay3); } } -.transfer { + +.transfer-body { max-height: 75vh; overflow-y: auto; } @@ -16,7 +17,7 @@ overflow-x: scroll; } -.transfer .list-group .list-group-item { +.transfer-body .list-group .list-group-item { min-width: max-content; background-color: var(--overlay3); } @@ -24,3 +25,13 @@ .entry { margin-top: 1%; } + +.transfer-modal { + .modal-dialog { + max-width: 500px; + max-height: 80%; + } + p { + font-size: 16px; + } +} diff --git a/site/src/pages/RoadmapPage/Transfer.tsx b/site/src/pages/RoadmapPage/Transfer.tsx index 86fe2c0a..6f2dc4d3 100644 --- a/site/src/pages/RoadmapPage/Transfer.tsx +++ b/site/src/pages/RoadmapPage/Transfer.tsx @@ -80,11 +80,11 @@ const Transfer: FC = ({ missingPrereqNames }) => { }; return ( - +

Transfer Credits

- +

Record your AP Credits or Community College Credits here. Doing so will clear the prerequisites on the roadmap. From 1e515855f0c5b2587e6cfe43b2253d09c2c596aa Mon Sep 17 00:00:00 2001 From: Cadecraft Date: Sat, 7 Dec 2024 00:10:58 -0800 Subject: [PATCH 4/5] feat: transfer button style improve --- site/src/pages/RoadmapPage/Transfer.scss | 21 +++++++++++++++++++++ site/src/pages/RoadmapPage/Transfer.tsx | 14 ++++++++------ 2 files changed, 29 insertions(+), 6 deletions(-) diff --git a/site/src/pages/RoadmapPage/Transfer.scss b/site/src/pages/RoadmapPage/Transfer.scss index 9b0ae774..d286e958 100644 --- a/site/src/pages/RoadmapPage/Transfer.scss +++ b/site/src/pages/RoadmapPage/Transfer.scss @@ -26,6 +26,27 @@ margin-top: 1%; } +.add-entry { + background-color: transparent; + color: var(--peterportal-primary-color-1); + font-size: 17px; + font-weight: 500; + width: fit-content; + margin-inline: auto; +} + +.add-entry:hover { + background-color: transparent; + color: var(--peterportal-primary-color-1); +} + +[data-theme='dark'] { + .add-entry, + .add-entry:hover { + color: var(--peterportal-primary-color-2); + } +} + .transfer-modal { .modal-dialog { max-width: 500px; diff --git a/site/src/pages/RoadmapPage/Transfer.tsx b/site/src/pages/RoadmapPage/Transfer.tsx index 6f2dc4d3..9d87ca26 100644 --- a/site/src/pages/RoadmapPage/Transfer.tsx +++ b/site/src/pages/RoadmapPage/Transfer.tsx @@ -8,6 +8,7 @@ import Container from 'react-bootstrap/Container'; import Row from 'react-bootstrap/Row'; import Col from 'react-bootstrap/Col'; import CloseButton from 'react-bootstrap/CloseButton'; +import { PlusLg } from 'react-bootstrap-icons'; import { setShowTransfer, deleteTransfer, setTransfer, addTransfer } from '../../store/slices/roadmapSlice'; import { useAppSelector, useAppDispatch } from '../../store/hooks'; @@ -107,12 +108,13 @@ const Transfer: FC = ({ missingPrereqNames }) => { - - - From 0b9edc512aa68a7f1271169790b908fbf6a35e9f Mon Sep 17 00:00:00 2001 From: Cadecraft Date: Mon, 9 Dec 2024 15:29:41 -0800 Subject: [PATCH 5/5] feat: further improve add entry button style --- site/src/pages/RoadmapPage/Transfer.scss | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/site/src/pages/RoadmapPage/Transfer.scss b/site/src/pages/RoadmapPage/Transfer.scss index d286e958..75a54ac8 100644 --- a/site/src/pages/RoadmapPage/Transfer.scss +++ b/site/src/pages/RoadmapPage/Transfer.scss @@ -30,9 +30,12 @@ background-color: transparent; color: var(--peterportal-primary-color-1); font-size: 17px; - font-weight: 500; + font-weight: bold; width: fit-content; margin-inline: auto; + display: flex; + align-items: center; + gap: 4px; } .add-entry:hover {