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

chore(contactus): styling fixes based on design feedback #1470

Merged
merged 3 commits into from
Sep 6, 2023
Merged

chore(contactus): styling fixes based on design feedback #1470

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4e6dfa2
chore(contactus): styling fixes based on design feedback
dcshzj Sep 4, 2023
5ae1776
fix: use subhead-1 styling instead
dcshzj Sep 4, 2023
2988f85
chore: remove unused import
dcshzj Sep 4, 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
2 changes: 1 addition & 1 deletion src/layouts/components/ContactUs/ContactCard.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ export const ContactCard = ({
return (
<Editable.DraggableAccordionItem
index={index}
title={frontMatter.title || "New Contact Information"}
title={frontMatter.title || "New contact information"}
draggableId={`contacts-${index}`}
isInvalid={getHasErrors(errors)}
>
Expand Down
6 changes: 3 additions & 3 deletions src/layouts/components/ContactUs/GeneralInfoSection.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ export const GeneralInfoSection = ({
title="General Information"
isInvalid={!!errors.agency_name || !!errors.feedback}
>
<Editable.Section spacing="1.25rem">
<Editable.Section spacing="1.25rem" pb="1.25rem">
seaerchin marked this conversation as resolved.
Show resolved Hide resolved
<FormControl isRequired isInvalid={!!errors.agency_name}>
<FormLabel>Name of Organisation / Agency</FormLabel>
<Input
Expand Down Expand Up @@ -69,8 +69,8 @@ export const GeneralInfoSection = ({
/>
<Text textStyle="caption-2" color="base.content.medium">
<Text as="span">
This is optional and appears at the bottom of your screen. If
you don&apos;t have a feedback form, you can use
This is optional and appears at the bottom of your Contact Us
page. If you don&apos;t have a feedback form, you can use
</Text>
<Text as="span" fontWeight="bold">
{" "}
Expand Down
5 changes: 3 additions & 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 @@ -53,7 +53,7 @@ export const LocationCard = ({
return (
<Editable.DraggableAccordionItem
index={index}
title={frontMatter.title || "New Location"}
title={frontMatter.title || "New location"}
draggableId={`locations-${index}`}
isInvalid={getHasErrors(errors)}
>
Expand Down Expand Up @@ -227,7 +227,7 @@ export const LocationCard = ({
colorScheme="critical"
mt="0.5rem"
>
Remove operating hours
Delete operating hours
</Button>
</Editable.Section>
</Editable.DraggableAccordionItem>
Expand All @@ -240,6 +240,7 @@ export const LocationCard = ({
</DragDropContext>

<AddSectionButton
mt="0.5rem"
w="100%"
id={`locations-${index}-add_operating_hours`}
buttonText="Add operating hours"
Expand Down
1 change: 1 addition & 0 deletions src/layouts/components/Editable/AddSectionButton.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ export const AddSectionButton = ({
isStretch
isOpen={isOpen}
rightIcon={undefined}
size="lg"
seaerchin marked this conversation as resolved.
Show resolved Hide resolved
{...rest}
>
<HStack spacing="0.5rem" justify="center">
Expand Down
11 changes: 8 additions & 3 deletions src/layouts/components/Editable/Editable.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,13 @@ export const EmptySection = ({
justifyContent="center"
>
{image}
<Text>{title}</Text>
<Text
textColor="base.content.strong"
textAlign="center"
lineHeight="1.75rem"
>
{title}
</Text>
seaerchin marked this conversation as resolved.
Show resolved Hide resolved
<Text
textStyle="caption-2"
textColor="base.content.medium"
Expand All @@ -97,7 +103,6 @@ const EditableSidebar = ({
bg="base.canvas.alt"
width="450px"
overflowY="scroll"
pb="100px"
// NOTE: We reserve 80px **each** for
// both the header and the footer
h="calc(100vh - 160px - 1rem)"
Expand Down Expand Up @@ -217,7 +222,7 @@ const EditableAccordionItem = ({
{/* NOTE: Check with design on styling.
See if entire section is button (ie, whole component hover styling)
*/}
<AccordionButton px="1.5rem" py="3rem">
<AccordionButton px="1.5rem" py="2.125rem">
seaerchin marked this conversation as resolved.
Show resolved Hide resolved
<Flex flex="1" flexDir="column">
<Text textStyle="h6" textAlign="left" mt="0.25rem" noOfLines={1}>
{title}
Expand Down