Skip to content
Open
Changes from all commits
Commits
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
15 changes: 13 additions & 2 deletions apps/ocp-plugin/src/components/common/WithPageLayout.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,17 @@ import PageNavigation from '@flightctl/ui-components/src/components/common/PageN
import { SystemRestoreProvider } from '@flightctl/ui-components/src/hooks/useSystemRestoreContext';
import { PermissionsContextProvider } from '@flightctl/ui-components/src/components/common/PermissionsContext';

// The OCP console uses "calc" to calculate padding values for page containers and breadcrumbs.
// But some CSS variables it uses are undefined, so the "calc" values are invalid.
const ocpPageRootStyles: React.CSSProperties = {
// Ensure page containers have inline padding
['--pf-v6-c-page__main-container--BorderInlineEndWidth' as string]: '0px',
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Using "0" does not seem to work with the calc expressions

.pf-v6-c-page__main-section.pf-m-padding {
  padding-block-start: var(--pf-v6-c-page__main-section--PaddingBlockStart);
  padding-block-end: var(--pf-v6-c-page__main-section--PaddingBlockEnd);
  padding-inline-start: calc(var(--pf-v6-c-page__main-section--PaddingInlineStart) - var(--pf-v6-c-page__main-container--BorderInlineStartWidth));
  padding-inline-end: calc(var(--pf-v6-c-page__main-section--PaddingInlineEnd) - var(--pf-v6-c-page__main-container--BorderInlineEndWidth));
}

['--pf-v6-c-page__main-container--BorderInlineStartWidth' as string]: '0px',
// Ensure page breadcrumbs have inline padding
['--pf-v6-c-page__main-breadcrumb--PaddingInlineStart' as string]: '1rem',
['--pf-v6-c-page__main-breadcrumb--PaddingInlineEnd' as string]: '1rem',
};

const WithPageLayoutContent = ({ children }: React.PropsWithChildren) => {
const { mustShowOrganizationSelector } = useOrganizationGuardContext();

Expand All @@ -15,10 +26,10 @@ const WithPageLayoutContent = ({ children }: React.PropsWithChildren) => {
}

return (
<>
<div style={ocpPageRootStyles}>
<PageNavigation showSettings={false} />
{children}
</>
</div>
);
};

Expand Down