From 0b705ec20f27a3e2256492007634422e58c7ef91 Mon Sep 17 00:00:00 2001
From: Jenny <32821331+jenny-s51@users.noreply.github.com>
Date: Fri, 2 May 2025 11:54:34 -0400
Subject: [PATCH] Fix UI bugs in PF Theme
Signed-off-by: Jenny <32821331+jenny-s51@users.noreply.github.com>
remove diff file
Signed-off-by: Jenny <32821331+jenny-s51@users.noreply.github.com>
fix toolbar filter component structure
format document
Signed-off-by: Jenny <32821331+jenny-s51@users.noreply.github.com>
fix formatting
Signed-off-by: Jenny <32821331+jenny-s51@users.noreply.github.com>
Revert default theme to MUI
---
workspaces/frontend/src/app/App.tsx | 13 ++++++
workspaces/frontend/src/app/NavSidebar.tsx | 19 +++++---
workspaces/frontend/src/app/const.ts | 2 +
.../Workspaces/Creation/WorkspaceCreation.tsx | 4 +-
.../frontend/src/images/logo-dark-theme.svg | 43 +++++++++++++++++++
.../frontend/src/shared/components/Filter.tsx | 18 ++++----
6 files changed, 82 insertions(+), 17 deletions(-)
create mode 100644 workspaces/frontend/src/images/logo-dark-theme.svg
diff --git a/workspaces/frontend/src/app/App.tsx b/workspaces/frontend/src/app/App.tsx
index 54ccb3a6..098b393c 100644
--- a/workspaces/frontend/src/app/App.tsx
+++ b/workspaces/frontend/src/app/App.tsx
@@ -2,9 +2,12 @@ import * as React from 'react';
import '@patternfly/react-core/dist/styles/base.css';
import './app.css';
import {
+ Brand,
Flex,
Masthead,
+ MastheadBrand,
MastheadContent,
+ MastheadLogo,
MastheadMain,
MastheadToggle,
Page,
@@ -13,6 +16,7 @@ import {
} from '@patternfly/react-core';
import { BarsIcon } from '@patternfly/react-icons';
import NamespaceSelector from '~/shared/components/NamespaceSelector';
+import logoDarkTheme from '~/images/logo-dark-theme.svg';
import { NamespaceContextProvider } from './context/NamespaceContextProvider';
import AppRoutes from './AppRoutes';
import NavSidebar from './NavSidebar';
@@ -37,6 +41,15 @@ const App: React.FC = () => {
+ {!isMUITheme() ? (
+
+
+
+
+
+ ) : (
+ ''
+ )}
diff --git a/workspaces/frontend/src/app/NavSidebar.tsx b/workspaces/frontend/src/app/NavSidebar.tsx
index c1abaa33..49a169ad 100644
--- a/workspaces/frontend/src/app/NavSidebar.tsx
+++ b/workspaces/frontend/src/app/NavSidebar.tsx
@@ -10,6 +10,7 @@ import {
PageSidebarBody,
} from '@patternfly/react-core';
import { useNavData, isNavDataGroup, NavDataHref, NavDataGroup } from './AppRoutes';
+import { isMUITheme, LOGO_LIGHT } from './const';
const NavHref: React.FC<{ item: NavDataHref }> = ({ item }) => (
@@ -49,13 +50,17 @@ const NavSidebar: React.FC = () => {