Skip to content

Commit

Permalink
Address review comments
Browse files Browse the repository at this point in the history
  • Loading branch information
kelvinkipruto committed Dec 10, 2024
1 parent 0ef5424 commit e248f09
Show file tree
Hide file tree
Showing 6 changed files with 25 additions and 22 deletions.
26 changes: 14 additions & 12 deletions apps/climatemappedafrica/src/components/AboutTeam/AboutTeam.js
Original file line number Diff line number Diff line change
Expand Up @@ -59,18 +59,20 @@ function AboutTeam({ title, members: membersProp }) {
afterChange={scrollToTeam}
responsive={responsive}
DotListProps={{
display: {
xs: membersCount > 2 ? "flex" : "none",
md: membersCount > 4 ? "flex" : "none",
},
"& button": {
borderColor: "#000",
height: theme.typography.pxToRem(16),
marginRight: theme.typography.pxToRem(12),
width: theme.typography.pxToRem(16),
},
"& .react-multi-carousel-dot--active button": {
borderColor: "#000",
sx: {
display: {
xs: membersCount > 2 ? "flex" : "none",
md: membersCount > 4 ? "flex" : "none",
},
"& button": {
borderColor: "#000",
height: theme.typography.pxToRem(16),
marginRight: theme.typography.pxToRem(12),
width: theme.typography.pxToRem(16),
},
"& .react-multi-carousel-dot--active button": {
borderColor: "#000",
},
},
}}
>
Expand Down
2 changes: 1 addition & 1 deletion apps/climatemappedafrica/src/components/Card/ActionArea.js
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ function ActionArea({
"& .MuiCardActionArea-root": {
...ActionAreaRootProps,
},
"& ..MuiCardActionArea-focusHighlight": {
"& .MuiCardActionArea-focusHighlight": {
background: "transparent",
...FocusHighlightProps,
},
Expand Down
9 changes: 4 additions & 5 deletions apps/climatemappedafrica/src/components/Card/Card.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { Link } from "@commons-ui/next";
import { Card as MuiCard, useTheme } from "@mui/material";
import { Card as MuiCard } from "@mui/material";
import PropTypes from "prop-types";
import React from "react";

Expand Down Expand Up @@ -27,7 +27,6 @@ function Card({
sx,
}) {
const squareMedia = mediaProps?.square;
const theme = useTheme();
const actionAreaProps = { href, onClick };
const contentProps = {
description,
Expand Down Expand Up @@ -76,14 +75,14 @@ function Card({
<CardContent
{...contentProps}
TitleProps={{
sx: {
marginTop: theme.typography.pxToRem(squareMedia ? 20 : 40),
sx: ({ typography }) => ({
marginTop: typography.pxToRem(squareMedia ? 20 : 40),
overflow: "hidden",
display: "-webkit-box",
WebkitLineClamp: 2,
WebkitBoxOrient: "vertical",
textOverflow: "ellipsis",
},
}),
}}
DescriptionProps={{
sx: {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ const Carousel = React.forwardRef(function Carousel(props, ref) {
borderColor: "#A0A0A0",
background: "#000",
},
...DotListProps,
...DotListProps?.sx,
},
})}
>
Expand Down
2 changes: 1 addition & 1 deletion apps/climatemappedafrica/src/components/Menu/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ function Menu({ children, explorePagePath, links, socialLinks, LinkProps }) {
padding: `${typography.pxToRem(16)} ${typography.pxToRem(30)} `,
border: "1px solid",
},
...LinkProps,
...LinkProps?.sx,
})}
>
<Typography
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -158,8 +158,10 @@ function MobileNavigation({
links={menus}
socialLinks={socialLinks}
LinkProps={{
padding: 0,
margin: `${theme.typography.pxToRem(10)} 0`,
sx: {
padding: 0,
margin: `${theme.typography.pxToRem(10)} 0`,
},
}}
>
<DropdownSearch
Expand Down

0 comments on commit e248f09

Please sign in to comment.