Skip to content

Commit 6fe7716

Browse files
authored
feat(ws): Notebooks 2.0 // Frontend // Workspace details // Applies MUI Theming (#185)
Signed-off-by: Jenny <32821331+jenny-s51@users.noreply.github.com> fix tab content padding apply horizontal variant to description list, add dividers to match KF central UI update spacer size Signed-off-by: Jenny <32821331+jenny-s51@users.noreply.github.com> update font size for description list term
1 parent 8ceb835 commit 6fe7716

File tree

4 files changed

+49
-7
lines changed

4 files changed

+49
-7
lines changed

workspaces/frontend/src/app/pages/Workspaces/Details/WorkspaceDetails.tsx

Lines changed: 17 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@ import {
99
Tab,
1010
TabTitleText,
1111
Title,
12+
TabContentBody,
13+
TabContent,
1214
} from '@patternfly/react-core';
1315
import { Workspace } from '~/shared/types';
1416
import { WorkspaceDetailsOverview } from '~/app/pages/Workspaces/Details/WorkspaceDetailsOverview';
@@ -37,7 +39,7 @@ export const WorkspaceDetails: React.FunctionComponent<WorkspaceDetailsProps> =
3739
};
3840

3941
return (
40-
<DrawerPanelContent isResizable defaultSize="50%">
42+
<DrawerPanelContent>
4143
<DrawerHead>
4244
<Title headingLevel="h6">{workspace.name}</Title>
4345
<WorkspaceDetailsActions onEditClick={onEditClick} onDeleteClick={onDeleteClick} />
@@ -48,20 +50,30 @@ export const WorkspaceDetails: React.FunctionComponent<WorkspaceDetailsProps> =
4850
<DrawerPanelBody>
4951
<Tabs activeKey={activeTabKey} onSelect={handleTabClick}>
5052
<Tab eventKey={0} title={<TabTitleText>Overview</TabTitleText>} aria-label="Overview">
51-
<WorkspaceDetailsOverview workspace={workspace} />
53+
<TabContent id="overviewSectionBodyPadding">
54+
<TabContentBody hasPadding>
55+
<WorkspaceDetailsOverview workspace={workspace} />
56+
</TabContentBody>
57+
</TabContent>
5258
</Tab>
5359
<Tab eventKey={1} title={<TabTitleText>Activity</TabTitleText>} aria-label="Activity">
54-
Activity
60+
<TabContent id="activitySectionBodyPadding">
61+
<TabContentBody hasPadding>Activity</TabContentBody>
62+
</TabContent>
5563
</Tab>
5664
<Tab eventKey={2} title={<TabTitleText>Logs</TabTitleText>} aria-label="Logs">
57-
Logs
65+
<TabContent id="logsSectionBodyPadding">
66+
<TabContentBody hasPadding>Logs</TabContentBody>
67+
</TabContent>
5868
</Tab>
5969
<Tab
6070
eventKey={3}
6171
title={<TabTitleText>Pod template</TabTitleText>}
6272
aria-label="Pod template"
6373
>
64-
Pod template
74+
<TabContent id="podTemplateBodyPadding">
75+
<TabContentBody hasPadding>Pod template</TabContentBody>
76+
</TabContent>
6577
</Tab>
6678
</Tabs>
6779
</DrawerPanelBody>

workspaces/frontend/src/app/pages/Workspaces/Details/WorkspaceDetailsOverview.tsx

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import {
44
DescriptionListTerm,
55
DescriptionListGroup,
66
DescriptionListDescription,
7+
Divider,
78
} from '@patternfly/react-core';
89
import { Workspace } from '~/shared/types';
910

@@ -14,24 +15,28 @@ type WorkspaceDetailsOverviewProps = {
1415
export const WorkspaceDetailsOverview: React.FunctionComponent<WorkspaceDetailsOverviewProps> = ({
1516
workspace,
1617
}) => (
17-
<DescriptionList>
18+
<DescriptionList isHorizontal>
1819
<DescriptionListGroup>
1920
<DescriptionListTerm>Name</DescriptionListTerm>
2021
<DescriptionListDescription>{workspace.name}</DescriptionListDescription>
2122
</DescriptionListGroup>
23+
<Divider />
2224
<DescriptionListGroup>
2325
<DescriptionListTerm>Kind</DescriptionListTerm>
2426
<DescriptionListDescription>{workspace.kind}</DescriptionListDescription>
2527
</DescriptionListGroup>
28+
<Divider />
2629
<DescriptionListGroup>
2730
<DescriptionListTerm>Labels</DescriptionListTerm>
2831
<DescriptionListDescription>
2932
{workspace.podTemplate.podMetadata.labels.join(', ')}
3033
</DescriptionListDescription>
3134
</DescriptionListGroup>
35+
<Divider />
3236
<DescriptionListGroup>
3337
<DescriptionListTerm>Pod config</DescriptionListTerm>
3438
<DescriptionListDescription>{workspace.options.podConfig}</DescriptionListDescription>
3539
</DescriptionListGroup>
40+
<Divider />
3641
</DescriptionList>
3742
);

workspaces/frontend/src/app/pages/Workspaces/Workspaces.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -375,7 +375,7 @@ export const Workspaces: React.FunctionComponent = () => {
375375
);
376376

377377
return (
378-
<Drawer isExpanded={selectedWorkspace != null}>
378+
<Drawer isInline isExpanded={selectedWorkspace != null}>
379379
<DrawerContent panelContent={workspaceDetailsContent}>
380380
<DrawerContentBody>
381381
<PageSection isFilled>

workspaces/frontend/src/shared/style/MUI-theme.scss

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,9 @@
2323
--mui-button--LineHeight: 1.75;
2424
--mui-link-underlineColor: rgba(33, 150, 243, 0.4);
2525

26+
// Drawer
27+
--mui-drawer-BorderLeft: var(--mui-palette-grey-300);
28+
2629
// Menu item
2730
--mui-menu__item--PaddingBlockStart: 6px;
2831
--mui-menu__item--PaddingBlockEnd: 6px;
@@ -175,10 +178,24 @@
175178
--pf-v6-c-button--BackgroundColor: rgba(33, 150, 243, 0.04);
176179
}
177180

181+
.mui-theme .pf-v6-c-description-list {
182+
--pf-v6-c-description-list--RowGap: var(--pf-t--global--spacer--gap--group-to-group--horizontal--compact);
183+
}
184+
185+
.mui-theme .pf-v6-c-description-list__term {
186+
font: var(--mui-font-subtitle2);
187+
}
188+
178189
.mui-theme .pf-v6-c-description-list__text .pf-v6-l-split__item.pf-m-fill {
179190
align-content: center;
180191
}
181192

193+
194+
195+
.mui-theme .pf-v6-c-drawer {
196+
--pf-v6-c-drawer--m-inline--m-expanded__panel--after--BackgroundColor: var(--mui-drawer-BorderLeft);
197+
}
198+
182199
.mui-theme .pf-v6-c-form__group {
183200
position: relative;
184201
}
@@ -669,6 +686,13 @@
669686
--pf-v6-c-tab-content__body--m-padding--PaddingInlineStart: var(--pf-t--global--spacer--lg);
670687
}
671688

689+
.pf-v6-c-tab-content__body.pf-m-padding {
690+
--pf-v6-c-tab-content__body--PaddingInlineStart: 0px;
691+
--pf-v6-c-tab-content__body--PaddingInlineEnd: 0px;
692+
--pf-v6-c-tab-content__body--PaddingBlockStart: var(--mui-spacing-8px);
693+
--pf-v6-c-tab-content__body--PaddingBlockEnd: var(--mui-spacing-8px);
694+
}
695+
672696
.mui-theme .pf-v6-c-tabs {
673697
--pf-v6-c-tabs__link--hover--BackgroundColor: var(--mui-tabs__link--hover--BackgroundColor);
674698
--pf-v6-c-tabs__item--PaddingBlockStart: var(--mui-tabs__item--PaddingBlockStart);
@@ -760,6 +784,7 @@
760784
}
761785

762786
.mui-theme .pf-v6-c-page__main-container {
787+
--pf-v6-c-page__main-container--BorderWidth: 0px;
763788
--pf-v6-c-page__main-container--BorderRadius: var(--mui-shape-borderRadius);
764789
box-shadow: var(--mui-shadows-1);
765790
}

0 commit comments

Comments
 (0)