diff --git a/CHANGELOG.md b/CHANGELOG.md
index 87d8d318dd3..dc2f98b555e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -21,11 +21,11 @@ The types of changes are:
* Improved standard layout for large width screens and polished misc. pages [#2869](https://github.com/ethyca/fides/pull/2869)
* Deprecated adding scopes to users directly; you can only add roles. [#2848](https://github.com/ethyca/fides/pull/2848/files)
* Changed About Fides page to say "Fides Core Version:" over "Version". [#2899](https://github.com/ethyca/fides/pull/2899)
+* Polish Admin UI header & navigation [#2897](https://github.com/ethyca/fides/pull/2897)
### Fixed
* Restricted Contributors from being able to create Owners [#2888](https://github.com/ethyca/fides/pull/2888)
-
## [2.9.1](https://github.com/ethyca/fides/compare/2.9.0...2.9.1)
### Added
diff --git a/clients/admin-ui/package-lock.json b/clients/admin-ui/package-lock.json
index 1d908e016db..826f2b26356 100644
--- a/clients/admin-ui/package-lock.json
+++ b/clients/admin-ui/package-lock.json
@@ -8,7 +8,7 @@
"dependencies": {
"@emotion/react": "^11.10.5",
"@emotion/styled": "^11.10.5",
- "@fidesui/components": "^0.2.2",
+ "@fidesui/components": "^0.3.0",
"@fidesui/react": "^0.0.21",
"@fontsource/inter": "^4.5.4",
"@monaco-editor/react": "^4.4.5",
@@ -2435,9 +2435,9 @@
}
},
"node_modules/@fidesui/components": {
- "version": "0.2.2",
- "resolved": "https://registry.npmjs.org/@fidesui/components/-/components-0.2.2.tgz",
- "integrity": "sha512-+kJX89+jjjctvbmOIGFgOFXpU7jep/p9FANTaZeDuwlefgU5Xg5r8NlEMq0BCMDAqkn6VRqy+dB1FWeLro2y4A==",
+ "version": "0.3.0",
+ "resolved": "https://registry.npmjs.org/@fidesui/components/-/components-0.3.0.tgz",
+ "integrity": "sha512-uXv6rLmpctu4Cn2IAEUTwCZg43AVGCXkLZSjR3xyN0YRfrC8ISPxb2WyUJzspKx5TpeiubB3MQ3Z+XtN458OpA==",
"dependencies": {
"@fidesui/react": "^0.0.21",
"chakra-react-select": "^3.3.7"
@@ -15303,9 +15303,9 @@
"dev": true
},
"@fidesui/components": {
- "version": "0.2.2",
- "resolved": "https://registry.npmjs.org/@fidesui/components/-/components-0.2.2.tgz",
- "integrity": "sha512-+kJX89+jjjctvbmOIGFgOFXpU7jep/p9FANTaZeDuwlefgU5Xg5r8NlEMq0BCMDAqkn6VRqy+dB1FWeLro2y4A==",
+ "version": "0.3.0",
+ "resolved": "https://registry.npmjs.org/@fidesui/components/-/components-0.3.0.tgz",
+ "integrity": "sha512-uXv6rLmpctu4Cn2IAEUTwCZg43AVGCXkLZSjR3xyN0YRfrC8ISPxb2WyUJzspKx5TpeiubB3MQ3Z+XtN458OpA==",
"requires": {
"@fidesui/react": "^0.0.21",
"chakra-react-select": "^3.3.7"
diff --git a/clients/admin-ui/package.json b/clients/admin-ui/package.json
index 6b0b3cb5afa..73f0ba09d81 100644
--- a/clients/admin-ui/package.json
+++ b/clients/admin-ui/package.json
@@ -27,7 +27,7 @@
"dependencies": {
"@emotion/react": "^11.10.5",
"@emotion/styled": "^11.10.5",
- "@fidesui/components": "^0.2.2",
+ "@fidesui/components": "^0.3.0",
"@fidesui/react": "^0.0.21",
"@fontsource/inter": "^4.5.4",
"@monaco-editor/react": "^4.4.5",
diff --git a/clients/admin-ui/src/features/common/Header.tsx b/clients/admin-ui/src/features/common/Header.tsx
index d51da68c78f..50b34f0d08c 100644
--- a/clients/admin-ui/src/features/common/Header.tsx
+++ b/clients/admin-ui/src/features/common/Header.tsx
@@ -16,6 +16,7 @@ import NextLink from "next/link";
import React from "react";
import { useDispatch, useSelector } from "react-redux";
+import logoImage from "~/../public/logo.svg";
import { INDEX_ROUTE } from "~/constants";
import { logout, selectUser, useLogoutMutation } from "~/features/auth";
import Image from "~/features/common/Image";
@@ -37,63 +38,56 @@ const Header: React.FC = () => {
};
return (
-
-
-
- {/* eslint-disable-next-line jsx-a11y/anchor-is-valid */}
-
-
-
-
-
- {username ? (
-
+ )}
-
+
);
};
diff --git a/clients/admin-ui/src/features/common/nav/v2/NavTopBar.tsx b/clients/admin-ui/src/features/common/nav/v2/NavTopBar.tsx
index c646a87d933..25e2b385dd8 100644
--- a/clients/admin-ui/src/features/common/nav/v2/NavTopBar.tsx
+++ b/clients/admin-ui/src/features/common/nav/v2/NavTopBar.tsx
@@ -14,11 +14,12 @@ export const NavTopBar = () => {
return (
{nav.groups.map((group) => {