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

Jump to bottom

[RHOAIENG-11447]: Identify and replace style overrides with MUI tokens #14

Merged
merged 5 commits into from
Sep 13, 2024
Merged

[RHOAIENG-11447]: Identify and replace style overrides with MUI tokens #14

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
f648fbb
bump to mui v6 betas, update css values with MUI tokens, WIP
jenny-s51 Aug 19, 2024
308e5b7
use theme vars
jenny-s51 Aug 19, 2024
7a8a78d
[WIP]: bump MUI v6 version, identify MUI tokens, declare other overri…
jenny-s51 Aug 22, 2024
6ce2259
add tabs tokens (#15)
jenny-s51 Sep 4, 2024
6d3bb0e
Add table tokens (#16)
jenny-s51 Sep 13, 2024
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: 2 additions & 0 deletions env.local
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
OC_PROJECT=opendatahub
NAMESPACE=jenny
136 changes: 70 additions & 66 deletions frontend/package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions frontend/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,9 +99,9 @@
"@babel/core": "^7.21.0",
"@cypress/code-coverage": "^3.12.34",
"@jsdevtools/coverage-istanbul-loader": "^3.0.5",
"@mui/material": "^5.16.4",
"@mui/icons-material": "^5.16.5",
"@mui/types": "^7.2.15",
"@mui/material": "6.0.0-rc.0",
"@mui/icons-material": "6.0.0-rc.0",
"@mui/types": "7.2.15",
"@testing-library/cypress": "^10.0.1",
"@testing-library/dom": "^9.3.4",
"@testing-library/jest-dom": "^6.3.0",
Expand Down
1 change: 0 additions & 1 deletion frontend/src/app/Header.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ import {
MastheadMain,
MastheadToggle,
PageToggleButton,
Switch,
} from '@patternfly/react-core';
import { BarsIcon } from '@patternfly/react-icons';
import { Link } from 'react-router-dom';
Expand Down
16 changes: 8 additions & 8 deletions frontend/src/app/HeaderTools.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ const HeaderTools: React.FC<HeaderToolsProps> = ({ onNotificationsClick }) => {

React.useEffect(() => {
window.isSwitched = !isChecked;
}, [window.isSwitched]);
}, [isChecked]);

const handleChange = (_event: React.FormEvent<HTMLInputElement>, checked: boolean) => {
setIsChecked(!checked);
Expand Down Expand Up @@ -147,13 +147,13 @@ const HeaderTools: React.FC<HeaderToolsProps> = ({ onNotificationsClick }) => {
<Toolbar isFullHeight>
<ToolbarContent>
<ToolbarItem>
<Switch
id="simple-switch"
label="Toggle MUI Theme"
isChecked={!isChecked}
onChange={handleChange}
ouiaId="BasicSwitch"
/>
<Switch
id="simple-switch"
label="Toggle MUI Theme"
isChecked={!isChecked}
onChange={handleChange}
ouiaId="BasicSwitch"
/>
</ToolbarItem>
<ToolbarGroup variant="action-group-plain" align={{ default: 'alignEnd' }}>
{!dashboardConfig.spec.dashboardConfig.disableAppLauncher ? (
Expand Down
4 changes: 3 additions & 1 deletion frontend/src/components/DashboardDescriptionListGroup.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,9 @@ const DashboardDescriptionListGroup: React.FC<DashboardDescriptionListGroupProps
) : (
<DescriptionListTerm>{title}</DescriptionListTerm>
)}
<DescriptionListDescription className={isEmpty && !isEditing ? text.textColorDisabledOnMd : ''}>
<DescriptionListDescription
className={isEmpty && !isEditing ? text.textColorDisabledOnMd : ''}
>
{isEditing ? contentWhenEditing : isEmpty ? contentWhenEmpty : children}
</DescriptionListDescription>
</DescriptionListGroup>
Expand Down
3 changes: 1 addition & 2 deletions ...rc/concepts/pipelines/content/pipelinesDetails/pipelineRun/PipelineRunDrawerRightTabs.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ import * as React from 'react';
import { DrawerPanelBody, Tab, TabContent, Tabs } from '@patternfly/react-core';
import SelectedNodeDetailsTab from '~/concepts/pipelines/content/pipelinesDetails/pipelineRun/SelectedNodeDetailsTab';
import SelectedNodeInputOutputTab from '~/concepts/pipelines/content/pipelinesDetails/pipelineRun/SelectedNodeInputOutputTab';
import LogsTab from '~/concepts/pipelines/content/pipelinesDetails/pipelineRun/runLogs/LogsTab';
import './PipelineRunDrawer.scss';
import { PipelineTask } from '~/concepts/pipelines/topology';
import { Execution } from '~/third_party/mlmd';
Expand Down Expand Up @@ -53,7 +52,7 @@ const PipelineRunDrawerRightTabs: React.FC<PipelineRunDrawerRightTabsProps> = ({
title: 'Logs',
isDisabled: !task.status?.podName,
// content: <LogsTab task={task} />,
content: <></>
content: <></>,
},
};

Expand Down
Loading
Loading