Skip to content

fix: restore Connect button outline in MUI theme #1350

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

Open
thisis-Shitanshu wants to merge 1 commit into
base: notebooks-v2
Choose a base branch
from
+35 −2
Open

fix: restore Connect button outline in MUI theme #1350

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
27 changes: 27 additions & 0 deletions workspaces/frontend/src/app/app.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -252,6 +252,33 @@ body,
margin-left: 0;
}

/* Preserve secondary MenuToggle styling when using the Kubeflow MUI theme. */
.mui-theme .kubeflow-connect-toggle.pf-m-secondary {
--pf-v6-c-menu-toggle--BackgroundColor: var(--pf-v6-c-menu-toggle--m-secondary--BackgroundColor);
--pf-v6-c-menu-toggle--PaddingInlineStart: var(
--pf-v6-c-menu-toggle--m-secondary--PaddingInlineStart
);
--pf-v6-c-menu-toggle--PaddingInlineEnd: var(
--pf-v6-c-menu-toggle--m-secondary--PaddingInlineEnd
);
--pf-v6-c-menu-toggle--BorderColor: var(--pf-v6-c-menu-toggle--m-secondary--BorderColor);
--pf-v6-c-menu-toggle--hover--BorderColor: var(
--pf-v6-c-menu-toggle--m-secondary--hover--BorderColor
);
--pf-v6-c-menu-toggle--expanded--BorderColor: var(
--pf-v6-c-menu-toggle--m-secondary--expanded--BorderColor
);
}

/* Preserve plain MenuToggle styling for workspace row actions when using the Kubeflow MUI theme. */
.mui-theme .kubeflow-workspace-actions-cell .pf-v6-c-menu-toggle.pf-m-plain {
--pf-v6-c-menu-toggle--BackgroundColor: var(--pf-v6-c-menu-toggle--m-plain--BackgroundColor);
--pf-v6-c-menu-toggle--PaddingInlineStart: var(
--pf-v6-c-menu-toggle--m-plain--PaddingInlineStart
);
--pf-v6-c-menu-toggle--PaddingInlineEnd: var(--pf-v6-c-menu-toggle--m-plain--PaddingInlineEnd);
}

/* Single-endpoint "Connect" control: rendered as a MenuToggle (so it keeps the
same size as the multi-endpoint dropdown), but its caret is rotated to point
right to signal that clicking connects directly instead of opening a menu. */
Expand Down
7 changes: 6 additions & 1 deletion workspaces/frontend/src/app/components/WorkspaceTable.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -428,7 +428,12 @@ const WorkspaceTable = React.forwardRef<WorkspaceTableRef, WorkspaceTableProps>(

if (columnKey === 'actions') {
return (
<Td isActionCell key="actions" data-testid="action-column">
<Td
isActionCell
key="actions"
data-testid="action-column"
className="kubeflow-workspace-actions-cell"
>
<ActionsColumn
items={rowActions(workspace).map((action) => ({
...action,
Expand Down
3 changes: 2 additions & 1 deletion workspaces/frontend/src/app/pages/Workspaces/WorkspaceConnectAction.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ export const WorkspaceConnectAction: React.FunctionComponent<WorkspaceConnectAct
return (
<MenuToggle
variant="secondary"
className="kubeflow-connect-toggle--direct"
className="kubeflow-connect-toggle kubeflow-connect-toggle--direct"
isDisabled={isDisabled}
onClick={() => openEndpoint(connectableServices[0].httpPath)}
aria-label="Connect to workspace"
Expand All @@ -75,6 +75,7 @@ export const WorkspaceConnectAction: React.FunctionComponent<WorkspaceConnectAct
<MenuToggle
ref={toggleRef}
variant="secondary"
className="kubeflow-connect-toggle"
onClick={onToggleClick}
isExpanded={open}
isDisabled={isDisabled}
Expand Down