Skip to content

Commit

Permalink
Merge pull request #2606 from headlamp-k8s/sectionheader-fix
Browse files Browse the repository at this point in the history 
frontend: SectionHeader: Fix prop alignment
  • Loading branch information
@joaquimrocha
joaquimrocha authored Dec 6, 2024
2 parents febe777 + f0bd9fb commit 800285a
Show file tree
Hide file tree
Showing 102 changed files with 199 additions and 201 deletions.
2 changes: 1 addition & 1 deletion ...nents/App/PluginSettings/__snapshots__/PluginSettings.DefaultSaveEnable.stories.storyshot
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
class="MuiGrid-root MuiGrid-item css-13i4rnv-MuiGrid-root"
>
<div
class="MuiBox-root css-15xsm7k"
class="MuiBox-root css-70qvj9"
>
<h1
class="MuiTypography-root MuiTypography-h1 MuiTypography-noWrap css-yeaech-MuiTypography-root"
Expand Down
2 changes: 1 addition & 1 deletion ...nd/src/components/App/PluginSettings/__snapshots__/PluginSettings.Empty.stories.storyshot
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
class="MuiGrid-root MuiGrid-item css-13i4rnv-MuiGrid-root"
>
<div
class="MuiBox-root css-15xsm7k"
class="MuiBox-root css-70qvj9"
>
<h1
class="MuiTypography-root MuiTypography-h1 MuiTypography-noWrap css-yeaech-MuiTypography-root"
Expand Down
2 changes: 1 addition & 1 deletion ...ents/App/PluginSettings/__snapshots__/PluginSettings.EmptyHomepageItems.stories.storyshot
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
class="MuiGrid-root MuiGrid-item css-13i4rnv-MuiGrid-root"
>
<div
class="MuiBox-root css-15xsm7k"
class="MuiBox-root css-70qvj9"
>
<h1
class="MuiTypography-root MuiTypography-h1 MuiTypography-noWrap css-yeaech-MuiTypography-root"
Expand Down
2 changes: 1 addition & 1 deletion ...src/components/App/PluginSettings/__snapshots__/PluginSettings.FewItems.stories.storyshot
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
class="MuiGrid-root MuiGrid-item css-13i4rnv-MuiGrid-root"
>
<div
class="MuiBox-root css-15xsm7k"
class="MuiBox-root css-70qvj9"
>
<h1
class="MuiTypography-root MuiTypography-h1 MuiTypography-noWrap css-yeaech-MuiTypography-root"
Expand Down
2 changes: 1 addition & 1 deletion ...rc/components/App/PluginSettings/__snapshots__/PluginSettings.ManyItems.stories.storyshot
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
class="MuiGrid-root MuiGrid-item css-13i4rnv-MuiGrid-root"
>
<div
class="MuiBox-root css-15xsm7k"
class="MuiBox-root css-70qvj9"
>
<h1
class="MuiTypography-root MuiTypography-h1 MuiTypography-noWrap css-yeaech-MuiTypography-root"
Expand Down
2 changes: 1 addition & 1 deletion ...rc/components/App/PluginSettings/__snapshots__/PluginSettings.MoreItems.stories.storyshot
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
class="MuiGrid-root MuiGrid-item css-13i4rnv-MuiGrid-root"
>
<div
class="MuiBox-root css-15xsm7k"
class="MuiBox-root css-70qvj9"
>
<h1
class="MuiTypography-root MuiTypography-h1 MuiTypography-noWrap css-yeaech-MuiTypography-root"
Expand Down
2 changes: 1 addition & 1 deletion ...nts/App/PluginSettings/__snapshots__/PluginSettingsDetails.WithAutoSave.stories.storyshot
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
class="MuiGrid-root MuiGrid-item css-13i4rnv-MuiGrid-root"
>
<div
class="MuiBox-root css-15xsm7k"
class="MuiBox-root css-70qvj9"
>
<h2
class="MuiTypography-root MuiTypography-h2 MuiTypography-noWrap css-m5vcfd-MuiTypography-root"
Expand Down
2 changes: 1 addition & 1 deletion .../App/PluginSettings/__snapshots__/PluginSettingsDetails.WithoutAutoSave.stories.storyshot
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
class="MuiGrid-root MuiGrid-item css-13i4rnv-MuiGrid-root"
>
<div
class="MuiBox-root css-15xsm7k"
class="MuiBox-root css-70qvj9"
>
<h2
class="MuiTypography-root MuiTypography-h2 MuiTypography-noWrap css-m5vcfd-MuiTypography-root"
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/components/App/Settings/__snapshots__/Settings.General.stories.storyshot
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
class="MuiGrid-root MuiGrid-item css-13i4rnv-MuiGrid-root"
>
<div
class="MuiBox-root css-15xsm7k"
class="MuiBox-root css-70qvj9"
>
<h1
class="MuiTypography-root MuiTypography-h1 MuiTypography-noWrap css-yeaech-MuiTypography-root"
Expand Down
4 changes: 2 additions & 2 deletions frontend/src/components/cluster/__snapshots__/Overview.Events.stories.storyshot
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
class="MuiGrid-root MuiGrid-item css-13i4rnv-MuiGrid-root"
>
<div
class="MuiBox-root css-15xsm7k"
class="MuiBox-root css-70qvj9"
>
<h2
class="MuiTypography-root MuiTypography-h2 MuiTypography-noWrap css-m5vcfd-MuiTypography-root"
Expand Down Expand Up @@ -474,7 +474,7 @@
class="MuiGrid-root MuiGrid-item css-13i4rnv-MuiGrid-root"
>
<div
class="MuiBox-root css-15xsm7k"
class="MuiBox-root css-70qvj9"
>
<h1
class="MuiTypography-root MuiTypography-h1 MuiTypography-noWrap css-yeaech-MuiTypography-root"
Expand Down
2 changes: 1 addition & 1 deletion ...ts/common/Resource/MainInfoSection/__snapshots__/MainInfoSection.Normal.stories.storyshot
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
class="MuiGrid-root MuiGrid-item css-13i4rnv-MuiGrid-root"
>
<div
class="MuiBox-root css-15xsm7k"
class="MuiBox-root css-70qvj9"
>
<h1
class="MuiTypography-root MuiTypography-h1 MuiTypography-noWrap css-yeaech-MuiTypography-root"
Expand Down
2 changes: 1 addition & 1 deletion ...mon/Resource/MainInfoSection/__snapshots__/MainInfoSection.NullBacklink.stories.storyshot
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
class="MuiGrid-root MuiGrid-item css-13i4rnv-MuiGrid-root"
>
<div
class="MuiBox-root css-15xsm7k"
class="MuiBox-root css-70qvj9"
>
<h1
class="MuiTypography-root MuiTypography-h1 MuiTypography-noWrap css-yeaech-MuiTypography-root"
Expand Down
2 changes: 1 addition & 1 deletion ...mponents/common/Resource/__snapshots__/ResourceListView.OneHiddenColumn.stories.storyshot
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
class="MuiGrid-root MuiGrid-item css-13i4rnv-MuiGrid-root"
>
<div
class="MuiBox-root css-15xsm7k"
class="MuiBox-root css-70qvj9"
>
<h1
class="MuiTypography-root MuiTypography-h1 MuiTypography-noWrap css-yeaech-MuiTypography-root"
Expand Down
34 changes: 16 additions & 18 deletions frontend/src/components/common/SectionHeader.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,25 +39,18 @@ export default function SectionHeader(props: SectionHeaderProps) {
>
<Grid item>
{(!!props.title || titleSideActions.length > 0) && (
<Box display="flex" flexDirection="column" alignItems="left">
<Box display="flex" alignItems="center">
{!!props.title && (
<>
<Typography
variant={titleVariants[headerStyle]}
noWrap
sx={theme => ({
...theme.palette.headerStyle[headerStyle || 'normal'],
whiteSpace: 'pre-wrap',
})}
>
{props.title}
</Typography>
{!!props.subtitle && (
<Typography variant="h6" component="h2" sx={{ fontStyle: 'italic' }}>
{props.subtitle}
</Typography>
)}
</>
<Typography
variant={titleVariants[headerStyle]}
noWrap
sx={theme => ({
...theme.palette.headerStyle[headerStyle || 'normal'],
whiteSpace: 'pre-wrap',
})}
>
{props.title}
</Typography>
)}
{!!titleSideActions && (
<Box ml={1} justifyContent="center">
Expand All @@ -66,6 +59,11 @@ export default function SectionHeader(props: SectionHeaderProps) {
)}
</Box>
)}
{!!props.subtitle && (
<Typography variant="h6" component="p" sx={{ fontStyle: 'italic' }}>
{props.subtitle}
</Typography>
)}
</Grid>
{actions.length > 0 && (
<Grid item>
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/components/common/Table/__snapshots__/Table.LabelSearch.stories.storyshot
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
class="MuiGrid-root MuiGrid-item css-13i4rnv-MuiGrid-root"
>
<div
class="MuiBox-root css-15xsm7k"
class="MuiBox-root css-70qvj9"
>
<h1
class="MuiTypography-root MuiTypography-h1 MuiTypography-noWrap css-yeaech-MuiTypography-root"
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/components/common/Table/__snapshots__/Table.NameSearch.stories.storyshot
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
class="MuiGrid-root MuiGrid-item css-13i4rnv-MuiGrid-root"
>
<div
class="MuiBox-root css-15xsm7k"
class="MuiBox-root css-70qvj9"
>
<h1
class="MuiTypography-root MuiTypography-h1 MuiTypography-noWrap css-yeaech-MuiTypography-root"
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/components/common/Table/__snapshots__/Table.NamespaceSearch.stories.storyshot
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
class="MuiGrid-root MuiGrid-item css-13i4rnv-MuiGrid-root"
>
<div
class="MuiBox-root css-15xsm7k"
class="MuiBox-root css-70qvj9"
>
<h1
class="MuiTypography-root MuiTypography-h1 MuiTypography-noWrap css-yeaech-MuiTypography-root"
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/components/common/Table/__snapshots__/Table.NamespaceSelect.stories.storyshot
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
class="MuiGrid-root MuiGrid-item css-13i4rnv-MuiGrid-root"
>
<div
class="MuiBox-root css-15xsm7k"
class="MuiBox-root css-70qvj9"
>
<h1
class="MuiTypography-root MuiTypography-h1 MuiTypography-noWrap css-yeaech-MuiTypography-root"
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/components/common/Table/__snapshots__/Table.NotFoundMessage.stories.storyshot
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
class="MuiGrid-root MuiGrid-item css-13i4rnv-MuiGrid-root"
>
<div
class="MuiBox-root css-15xsm7k"
class="MuiBox-root css-70qvj9"
>
<h1
class="MuiTypography-root MuiTypography-h1 MuiTypography-noWrap css-yeaech-MuiTypography-root"
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/components/common/Table/__snapshots__/Table.NumberSearch.stories.storyshot
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
class="MuiGrid-root MuiGrid-item css-13i4rnv-MuiGrid-root"
>
<div
class="MuiBox-root css-15xsm7k"
class="MuiBox-root css-70qvj9"
>
<h1
class="MuiTypography-root MuiTypography-h1 MuiTypography-noWrap css-yeaech-MuiTypography-root"
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/components/common/Table/__snapshots__/Table.UIDSearch.stories.storyshot
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
class="MuiGrid-root MuiGrid-item css-13i4rnv-MuiGrid-root"
>
<div
class="MuiBox-root css-15xsm7k"
class="MuiBox-root css-70qvj9"
>
<h1
class="MuiTypography-root MuiTypography-h1 MuiTypography-noWrap css-yeaech-MuiTypography-root"
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/components/common/__snapshots__/SectionBox.HeaderProps.stories.storyshot
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
class="MuiGrid-root MuiGrid-item css-13i4rnv-MuiGrid-root"
>
<div
class="MuiBox-root css-15xsm7k"
class="MuiBox-root css-70qvj9"
>
<h1
class="MuiTypography-root MuiTypography-h1 MuiTypography-noWrap css-yeaech-MuiTypography-root"
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/components/common/__snapshots__/SectionBox.Titled.stories.storyshot
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
class="MuiGrid-root MuiGrid-item css-13i4rnv-MuiGrid-root"
>
<div
class="MuiBox-root css-15xsm7k"
class="MuiBox-root css-70qvj9"
>
<h2
class="MuiTypography-root MuiTypography-h2 MuiTypography-noWrap css-m5vcfd-MuiTypography-root"
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/components/common/__snapshots__/SectionBox.TitledChildren.stories.storyshot
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
class="MuiGrid-root MuiGrid-item css-13i4rnv-MuiGrid-root"
>
<div
class="MuiBox-root css-15xsm7k"
class="MuiBox-root css-70qvj9"
>
<h2
class="MuiTypography-root MuiTypography-h2 MuiTypography-noWrap css-m5vcfd-MuiTypography-root"
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/components/common/__snapshots__/SectionHeader.Actions.stories.storyshot
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
class="MuiGrid-root MuiGrid-item css-13i4rnv-MuiGrid-root"
>
<div
class="MuiBox-root css-15xsm7k"
class="MuiBox-root css-70qvj9"
>
<h3
class="MuiTypography-root MuiTypography-h3 MuiTypography-noWrap css-omosr2-MuiTypography-root"
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/components/common/__snapshots__/SectionHeader.Main.stories.storyshot
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
class="MuiGrid-root MuiGrid-item css-13i4rnv-MuiGrid-root"
>
<div
class="MuiBox-root css-15xsm7k"
class="MuiBox-root css-70qvj9"
>
<h1
class="MuiTypography-root MuiTypography-h1 MuiTypography-noWrap css-yeaech-MuiTypography-root"
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/components/common/__snapshots__/SectionHeader.Normal.stories.storyshot
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
class="MuiGrid-root MuiGrid-item css-13i4rnv-MuiGrid-root"
>
<div
class="MuiBox-root css-15xsm7k"
class="MuiBox-root css-70qvj9"
>
<h3
class="MuiTypography-root MuiTypography-h3 MuiTypography-noWrap css-omosr2-MuiTypography-root"
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/components/common/__snapshots__/SectionHeader.NormalNoPadding.stories.storyshot
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
class="MuiGrid-root MuiGrid-item css-13i4rnv-MuiGrid-root"
>
<div
class="MuiBox-root css-15xsm7k"
class="MuiBox-root css-70qvj9"
>
<h3
class="MuiTypography-root MuiTypography-h3 MuiTypography-noWrap css-omosr2-MuiTypography-root"
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/components/common/__snapshots__/SectionHeader.Subsection.stories.storyshot
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
class="MuiGrid-root MuiGrid-item css-13i4rnv-MuiGrid-root"
>
<div
class="MuiBox-root css-15xsm7k"
class="MuiBox-root css-70qvj9"
>
<h2
class="MuiTypography-root MuiTypography-h2 MuiTypography-noWrap css-m5vcfd-MuiTypography-root"
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/components/common/__snapshots__/SimpleTable.LabelSearch.stories.storyshot
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
class="MuiGrid-root MuiGrid-item css-13i4rnv-MuiGrid-root"
>
<div
class="MuiBox-root css-15xsm7k"
class="MuiBox-root css-70qvj9"
>
<h1
class="MuiTypography-root MuiTypography-h1 MuiTypography-noWrap css-yeaech-MuiTypography-root"
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/components/common/__snapshots__/SimpleTable.NameSearch.stories.storyshot
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
class="MuiGrid-root MuiGrid-item css-13i4rnv-MuiGrid-root"
>
<div
class="MuiBox-root css-15xsm7k"
class="MuiBox-root css-70qvj9"
>
<h1
class="MuiTypography-root MuiTypography-h1 MuiTypography-noWrap css-yeaech-MuiTypography-root"
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/components/common/__snapshots__/SimpleTable.NamespaceSearch.stories.storyshot
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
class="MuiGrid-root MuiGrid-item css-13i4rnv-MuiGrid-root"
>
<div
class="MuiBox-root css-15xsm7k"
class="MuiBox-root css-70qvj9"
>
<h1
class="MuiTypography-root MuiTypography-h1 MuiTypography-noWrap css-yeaech-MuiTypography-root"
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/components/common/__snapshots__/SimpleTable.NamespaceSelect.stories.storyshot
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
class="MuiGrid-root MuiGrid-item css-13i4rnv-MuiGrid-root"
>
<div
class="MuiBox-root css-15xsm7k"
class="MuiBox-root css-70qvj9"
>
<h1
class="MuiTypography-root MuiTypography-h1 MuiTypography-noWrap css-yeaech-MuiTypography-root"
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/components/common/__snapshots__/SimpleTable.NotFoundMessage.stories.storyshot
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
class="MuiGrid-root MuiGrid-item css-13i4rnv-MuiGrid-root"
>
<div
class="MuiBox-root css-15xsm7k"
class="MuiBox-root css-70qvj9"
>
<h1
class="MuiTypography-root MuiTypography-h1 MuiTypography-noWrap css-yeaech-MuiTypography-root"
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/components/common/__snapshots__/SimpleTable.NumberSearch.stories.storyshot
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
class="MuiGrid-root MuiGrid-item css-13i4rnv-MuiGrid-root"
>
<div
class="MuiBox-root css-15xsm7k"
class="MuiBox-root css-70qvj9"
>
<h1
class="MuiTypography-root MuiTypography-h1 MuiTypography-noWrap css-yeaech-MuiTypography-root"
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/components/common/__snapshots__/SimpleTable.UIDSearch.stories.storyshot
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
class="MuiGrid-root MuiGrid-item css-13i4rnv-MuiGrid-root"
>
<div
class="MuiBox-root css-15xsm7k"
class="MuiBox-root css-70qvj9"
>
<h1
class="MuiTypography-root MuiTypography-h1 MuiTypography-noWrap css-yeaech-MuiTypography-root"
Expand Down
6 changes: 3 additions & 3 deletions frontend/src/components/configmap/__snapshots__/Details.Empty.stories.storyshot
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
class="MuiGrid-root MuiGrid-item css-13i4rnv-MuiGrid-root"
>
<div
class="MuiBox-root css-15xsm7k"
class="MuiBox-root css-70qvj9"
>
<h1
class="MuiTypography-root MuiTypography-h1 MuiTypography-noWrap css-yeaech-MuiTypography-root"
Expand Down Expand Up @@ -187,7 +187,7 @@
class="MuiGrid-root MuiGrid-item css-13i4rnv-MuiGrid-root"
>
<div
class="MuiBox-root css-15xsm7k"
class="MuiBox-root css-70qvj9"
>
<h2
class="MuiTypography-root MuiTypography-h2 MuiTypography-noWrap css-m5vcfd-MuiTypography-root"
Expand Down Expand Up @@ -232,7 +232,7 @@
class="MuiGrid-root MuiGrid-item css-13i4rnv-MuiGrid-root"
>
<div
class="MuiBox-root css-15xsm7k"
class="MuiBox-root css-70qvj9"
>
<h2
class="MuiTypography-root MuiTypography-h2 MuiTypography-noWrap css-m5vcfd-MuiTypography-root"
Expand Down
Loading

0 comments on commit 800285a

Please sign in to comment.