Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix/style nits #1483

Merged
merged 7 commits into from
Sep 7, 2023
Merged

Fix/style nits #1483

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
549c600
fix(nested-cards): fix spacing to 0.75rem
Sep 7, 2023
95a3b09
fix(editable): set extra padding
Sep 7, 2023
733e343
fix(edithoempage): fix errors
Sep 7, 2023
8aed598
fix(cardssection): remove errorneous spacing
Sep 7, 2023
7a00d29
fix(cards): remove extra margins
Sep 7, 2023
2052b62
fix(hero/infopic): update margins
Sep 7, 2023
63ac131
fix(editable): remove padding
Sep 7, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions src/layouts/EditHomepage/EditHomepage.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -966,11 +966,17 @@ const EditHomepage = ({ match }) => {
<HeroDropdownSection
{...section.hero.dropdown}
state={section.hero}
errors={errors}
errors={{
...errors,
...errors.sections[0].hero,
}}
/>
) : (
<HeroHighlightSection
errors={errors}
errors={{
...errors,
...errors.sections[0].hero,
}}
highlights={section.hero.key_highlights}
/>
)
Expand Down
2 changes: 1 addition & 1 deletion src/layouts/components/ContactUs/CardsSection.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ export const CardsSection = ({
subtitle={CONTACTUS_EMPTY_SECTION_SUBTITLE[contactUsType]}
isEmpty={cardFrontMatter.length === 0}
>
<VStack p={0} spacing="1.125rem">
<VStack p={0} spacing="1.25rem">
{cardFrontMatter.map((card, index) => (
<>
{contactUsType === "locations" ? (
Expand Down
3 changes: 1 addition & 2 deletions src/layouts/components/ContactUs/LocationCard.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ export const LocationCard = ({
isEmpty={frontMatter.operating_hours.length === 0}
>
<Editable.Accordion>
<VStack p={0} spacing="1.125rem">
<VStack p={0} spacing="0.75rem">
{frontMatter.operating_hours.map(
(operatingHour, operatingHourIndex) => (
<Editable.DraggableAccordionItem
Expand Down Expand Up @@ -222,7 +222,6 @@ export const LocationCard = ({
}
alignSelf="center"
colorScheme="critical"
mt="0.5rem"
>
Delete operating hours
</Button>
Expand Down
2 changes: 1 addition & 1 deletion src/layouts/components/Homepage/HeroBody.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ export const HeroBody = ({
onFieldChange={onChange}
isRequired
>
<Box mb="0.5rem">
<Box mb="0.75rem">
<FormTitle>Hero background image</FormTitle>
</Box>
<FormFieldMedia
Expand Down
3 changes: 1 addition & 2 deletions src/layouts/components/Homepage/HeroDropdownSection.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ export const HeroDropdownSection = ({
subtitle="Add options to allow users to quickly navigate your site"
isEmpty={state.dropdown.options.length === 0}
>
<Editable.Section px={0} spacing="1.25rem" py="1.5rem">
<Editable.Section px={0} spacing="0.75rem" py="1.5rem">
{state.dropdown.options.map(
(
{ title: optionTitle, url: optionUrl },
Expand Down Expand Up @@ -131,7 +131,6 @@ export const HeroDropdownSection = ({
alignSelf="center"
variant="clear"
colorScheme="critical"
mt="1rem"
>
Delete option
</Button>
Expand Down
3 changes: 1 addition & 2 deletions src/layouts/components/Homepage/HeroHighlightSection.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ export const HeroHighlightSection = ({
title="Highlights you add will appear here"
subtitle="You can call out informative links using highlights"
>
<Editable.Section px={0} spacing="1.25rem" py="1.5rem">
<Editable.Section px={0} spacing="0.75rem" py="1.5rem">
{highlights.map(
(
{
Expand Down Expand Up @@ -164,7 +164,6 @@ export const HeroHighlightSection = ({
alignSelf="center"
variant="clear"
colorScheme="critical"
mt="1rem"
>
Delete highlight
</Button>
Expand Down
4 changes: 3 additions & 1 deletion src/layouts/components/Homepage/InfopicBody.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,9 @@ export const InfopicBody = ({
onFieldChange={onChange}
isRequired
>
<FormTitle>Image</FormTitle>
<Box mb="0.75rem">
<FormTitle>Image</FormTitle>
</Box>
<FormFieldMedia
value={image}
id={`section-${index}-infopic-image`}
Expand Down
112 changes: 55 additions & 57 deletions src/layouts/components/NavBar/GroupMenuBody.tsx
View file
Open in desktop
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

change made was spacing + remove extra VStack

Original file line number Diff line number Diff line change
Expand Up @@ -74,64 +74,62 @@ export const GroupMenuBody = ({
isEmpty={sublinks.length === 0}
>
<Editable.Accordion>
<VStack p={0} spacing="1.25rem">
<VStack p={0} spacing="0.75rem">
{sublinks.map((sublink, sublinkIndex) => (
<VStack w="100%">
<Editable.DraggableAccordionItem
draggableId={`sublink-${index}-${sublinkIndex}-draggable`}
index={sublinkIndex}
title={sublink.title}
isInvalid={_.some(errors.sublinks[sublinkIndex])}
isNested
>
<Editable.Section mt="-0.5rem">
<FormControl
isRequired
isInvalid={!!errors.sublinks[sublinkIndex].title}
>
<FormLabel>Submenu name</FormLabel>
<Input
placeholder="New menu group"
id={`sublink-${index}-${sublinkIndex}-title`}
value={sublink.title}
onChange={onChange}
/>
<FormErrorMessage>
{errors.sublinks[sublinkIndex].title}
</FormErrorMessage>
</FormControl>
<FormControl
isRequired
isInvalid={!!errors.sublinks[sublinkIndex].url}
>
<FormLabel>Destination</FormLabel>
<Input
placeholder="Enter a /page-url or link for this menu item"
id={`sublink-${index}-${sublinkIndex}-url`}
value={sublink.url}
onChange={onChange}
/>
<FormErrorMessage>
{errors.sublinks[sublinkIndex].url}
</FormErrorMessage>
</FormControl>
<Button
id={`section-${index}-${sublinkIndex}`}
onClick={() =>
onDelete(
`sublink-${index}-${sublinkIndex}`,
"Submenu"
)
}
alignSelf="center"
variant="clear"
colorScheme="critical"
>
Delete submenu
</Button>
</Editable.Section>
</Editable.DraggableAccordionItem>
</VStack>
<Editable.DraggableAccordionItem
draggableId={`sublink-${index}-${sublinkIndex}-draggable`}
index={sublinkIndex}
title={sublink.title}
isInvalid={_.some(errors.sublinks[sublinkIndex])}
isNested
>
<Editable.Section mt="-0.5rem">
<FormControl
isRequired
isInvalid={!!errors.sublinks[sublinkIndex].title}
>
<FormLabel>Submenu name</FormLabel>
<Input
placeholder="New menu group"
id={`sublink-${index}-${sublinkIndex}-title`}
value={sublink.title}
onChange={onChange}
/>
<FormErrorMessage>
{errors.sublinks[sublinkIndex].title}
</FormErrorMessage>
</FormControl>
<FormControl
isRequired
isInvalid={!!errors.sublinks[sublinkIndex].url}
>
<FormLabel>Destination</FormLabel>
<Input
placeholder="Enter a /page-url or link for this menu item"
id={`sublink-${index}-${sublinkIndex}-url`}
value={sublink.url}
onChange={onChange}
/>
<FormErrorMessage>
{errors.sublinks[sublinkIndex].url}
</FormErrorMessage>
</FormControl>
<Button
id={`section-${index}-${sublinkIndex}`}
onClick={() =>
onDelete(
`sublink-${index}-${sublinkIndex}`,
"Submenu"
)
}
alignSelf="center"
variant="clear"
colorScheme="critical"
>
Delete submenu
</Button>
</Editable.Section>
</Editable.DraggableAccordionItem>
))}
</VStack>
</Editable.Accordion>
Expand Down