Design QA #2308
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,14 +1,7 @@ | ||
| import React from "react" | ||
| import type { OfferedByEnum } from "api" | ||
| import type { UnitChannel } from "api/v0" | ||
| import { Card, Skeleton, styled, theme, UnitLogo } from "ol-components" | ||
| import Link from "next/link" | ||
| import { usePostHog } from "posthog-js/react" | ||
| import { PostHogEvents } from "@/common/constants" | ||
|
|
@@ -23,9 +16,6 @@ const UnitCardContainer = styled.div({ | |
| alignItems: "center", | ||
| height: "100%", | ||
| backgroundColor: "rgba(243, 244, 248, 0.50)", | ||
| }) | ||
|
|
||
| const UnitCardContent = styled.div({ | ||
|
|
@@ -39,7 +29,7 @@ const LogoContainer = styled.div({ | |
| padding: "40px 32px", | ||
| backgroundColor: theme.custom.colors.white, | ||
| [theme.breakpoints.down("md")]: { | ||
| padding: "24px 16px", | ||
| ".MuiSkeleton-root": { | ||
| margin: "0 auto", | ||
| }, | ||
|
|
@@ -50,6 +40,7 @@ const LogoContainer = styled.div({ | |
| height: "40px", | ||
|
There was a problem hiding this comment. These are not horizontally centered at <md. Figma has a top and bottom padding of 24px (we have 34px and 14px). 
https://www.figma.com/design/Eux3guSenAFVvNHGi1Y9Wm/MIT-Design-System?node-id=14674-72974&m=dev 
|
||
| margin: "0 auto", | ||
| }, | ||
| maxWidth: "calc(100% - 32px)", | ||
| }, | ||
| }) | ||
|
|
||
|
|
@@ -59,50 +50,25 @@ const CardBottom = styled.div({ | |
| display: "flex", | ||
| flexGrow: 1, | ||
| flexDirection: "column", | ||
| justifyContent: "space-between", | ||
| gap: "24px", | ||
| ...theme.typography.body1, | ||
| [theme.breakpoints.down("md")]: { | ||
| ...theme.typography.body2, | ||
| padding: "16px", | ||
| gap: "16px", | ||
| }, | ||
| }) | ||
|
|
||
| const LoadingContent = styled.div({ | ||
| padding: "24px", | ||
| }) | ||
|
|
||
| const CountsTextContainer = styled.div({ | ||
| display: "flex", | ||
| gap: "10px", | ||
| }) | ||
|
|
||
| interface UnitCardsProps { | ||
| channels: UnitChannel[] | undefined | ||
| courseCounts: Record<string, number> | ||
|
|
@@ -144,16 +110,14 @@ const UnitCard: React.FC<UnitCardProps> = (props) => { | |
| </Link> | ||
| </LogoContainer> | ||
| <CardBottom> | ||
| {channel?.configuration?.heading} | ||
| <CountsTextContainer> | ||
| <span data-testid={`course-count-${unit.code}`}> | ||
| {courseCount > 0 ? `Courses: ${courseCount}` : ""} | ||
| </span> | ||
| <span data-testid={`program-count-${unit.code}`}> | ||
| {programCount > 0 ? `Programs: ${programCount}` : ""} | ||
| </span> | ||
| </CountsTextContainer> | ||
| </CardBottom> | ||
| </UnitCardContent> | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -12,10 +12,7 @@ const StyledToggleButtonGroup = styled(ToggleButtonGroup)` | |
| height: 40px; | ||
| border-radius: 4px; | ||
| ` | ||
|
|
||
| const ExplanationContainer = styled.div` | ||
| margin: 10px; | ||
| font-size: 0.875em; | ||
|
|
@@ -50,17 +47,40 @@ const StyledToggleButton = styled(ToggleButton)(({ theme }) => ({ | |
| backgroundColor: theme.custom.colors.white, | ||
| }, | ||
| ...theme.typography.subtitle3, | ||
|
|
||
| // MUI's ToggleButtonGroup have a -1 margin offset that caused problems for our borders. | ||
| "&.MuiToggleButtonGroup-middleButton, .MuiToggleButtonGroup-lastButton": { | ||
| margin: 0, | ||
| }, | ||
| /** | ||
| * The goal here is to ensure the icons: | ||
| * - scale at same rate when container shrinks | ||
| * - are hidden if container is too small | ||
| * | ||
| * NOTE: containerType: size enables the container query but requires setting | ||
| * a width on the container. We are doing this anyway. | ||
|
Comment on lines
+56
to
+61
There was a problem hiding this comment. @mbilalmughal Regarding Academic and Professional Icon scaling: As described in the issue, they scale at different rates on RC as window size decreases and it doesn't look great. Here are few options for addressing this issue. For now, (2) is implemented.
IMO (3) would be a good solution. When the facet sidebar gets too narrow it affects usability IMO. That said, I don't think we should consider (3) for now. This change would cause some issues with the cards getting too narrow. There was a problem hiding this comment. @ChristopherChudzicki I believe what you’ve done on (2) is great, Removing the icon makes sense here. 👍 |
||
| */ | ||
| containerType: "size", | ||
| boxSizing: "border-box", | ||
| "& > span": { | ||
| minWidth: "70px", | ||
| }, | ||
| "@container (max-width: 85px)": { | ||
| "& > svg": { | ||
| display: "none", | ||
| }, | ||
| }, | ||
| })) | ||
|
|
||
| const ViewAllButton = styled(StyledToggleButton)` | ||
| border-right: 1px solid; | ||
| border-color: ${({ theme }) => theme.custom.colors.silverGrayLight}; | ||
| width: 20%; | ||
| border-top-left-radius: 4px; | ||
| border-bottom-left-radius: 4px; | ||
| ` | ||
| const AcademicButton = styled(StyledToggleButton)` | ||
| border-right: 1px solid; | ||
| border-color: ${({ theme }) => theme.custom.colors.silverGrayLight}; | ||
| width: 40%; | ||
| ` | ||
|
|
@@ -88,18 +108,18 @@ const ProfessionalToggle: React.FC<{ | |
| } | ||
|
|
||
| return ( | ||
| <div> | ||
| <StyledToggleButtonGroup | ||
| value={professionalSetting} | ||
| exclusive | ||
| onChange={handleChange} | ||
| > | ||
| <ViewAllButton value="">All</ViewAllButton> | ||
| <AcademicButton value="false"> | ||
| <StyledRiBookOpenLine /> <span>Academic</span> | ||
| </AcademicButton> | ||
| <ProfesionalButton value="true"> | ||
| <StyledRiBriefcase3Line /> <span>Professional</span> | ||
| </ProfesionalButton> | ||
| </StyledToggleButtonGroup> | ||
| <Collapse in={professionalSetting === ""}> | ||
|
|
@@ -117,7 +137,7 @@ const ProfessionalToggle: React.FC<{ | |
| Content developed from MIT's professional curriculum | ||
| </ExplanationContainer> | ||
| </Collapse> | ||
| </div> | ||
| ) | ||
| } | ||
|
|
||
|
|
||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We have some default margin top on the title, so should account for that in the 80pc top margin:
In Figma:
https://www.figma.com/design/Eux3guSenAFVvNHGi1Y9Wm/MIT-Design-System?node-id=2197-31369&m=dev