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

2200 - Home screen header scaling and responsiveness issues #2277

Merged
merged 5 commits into from
Jan 20, 2023
Merged

2200 - Home screen header scaling and responsiveness issues #2277

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c830ff0
2200 - Home screen header scaling and responsiveness issues
chriscalhoun1974 Jan 19, 2023
f31607a
Updated CHANGELOG.md file
chriscalhoun1974 Jan 19, 2023
3a1408e
Updated HomeBanner component
chriscalhoun1974 Jan 19, 2023
fa35312
UI updates
chriscalhoun1974 Jan 20, 2023
870b38b
Merge branch 'main' into 2200-home-screen-header-scaling-and-responsi…
chriscalhoun1974 Jan 20, 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
3 changes: 3 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,9 @@ The types of changes are:

## [Unreleased](https://github.com/ethyca/fides/compare/2.5.0...main)

### Fixed

* Home screen header scaling and responsiveness issues [#2200](https://github.com/ethyca/fides/pull/2277)

## [2.5.0](https://github.com/ethyca/fides/compare/2.4.0...2.5.0)

Expand Down
20 changes: 10 additions & 10 deletions clients/admin-ui/src/home/HomeBanner.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Box, Flex, Image, Spacer, Text } from "@fidesui/react";
import { Flex, Image, Spacer, Text } from "@fidesui/react";
import * as React from "react";

import { useFeatures } from "~/features/common/features";
Expand All @@ -12,20 +12,20 @@ const HomeBanner: React.FC = () => {
background="linear-gradient(180deg, #FFFFFF 0%, #F8F8FF 100%);"
h="300px"
>
<Box h="128px" px="36px" w="597px">
<Flex flexDir="column" mt="40px" pos="absolute" px="36px" w="597px">
{hasSystems && (
<>
<Text
fontWeight="semibold"
fontSize="32px"
fontWeight="semibold"
h="40px"
lineHeight="32px"
>
Welcome back!
</Text>
<Text
fontWeight="semibold"
fontSize="18px"
fontWeight="semibold"
h="36px"
lineHeight="28px"
>
Expand All @@ -43,16 +43,16 @@ const HomeBanner: React.FC = () => {
{!hasSystems && (
<>
<Text
fontWeight="semibold"
fontSize="32px"
fontWeight="semibold"
h="40px"
lineHeight="32px"
>
Welcome to Fides!
</Text>
<Text
fontWeight="semibold"
fontSize="18px"
fontWeight="semibold"
h="36px"
lineHeight="28px"
>
Expand All @@ -66,11 +66,11 @@ const HomeBanner: React.FC = () => {
</Text>
</>
)}
</Box>
</Flex>
<Spacer />
<Box>
<Image alt="" height="100%" src="/images/config_splash.svg" />
</Box>
<Flex flexShrink={0}>
<Image alt="" boxSize="100%" src="/images/config_splash.svg" />
</Flex>
</Flex>
);
};
Expand Down
2 changes: 1 addition & 1 deletion clients/admin-ui/src/home/HomeLayout.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ const HomeLayout: React.FC<HomeLayoutProps> = ({ children, title }) => (
</Head>
<Header />
<NavTopBar />
<Flex flexDirection="column" gap="40px" py={10} width="100vw">
<Flex flexDirection="column" gap="40px" width="100vw">
{children}
</Flex>
</div>
Expand Down