-
Notifications
You must be signed in to change notification settings - Fork 95
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.
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
fix(page): fix section spacing #6766
Changes from 2 commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,9 +1,5 @@ | ||
#ws-core-c-page-with-or-without-fill .ws-preview-html, | ||
#ws-core-c-page-multiple-sidebar-body-elements-padding-and-fill .ws-preview-html { | ||
height: 500px; | ||
} | ||
|
||
#ws-core-c-page-multiple-sidebar-body-elements .ws-preview-html, | ||
#ws-core-c-page-using-flex-layout .ws-preview-html { | ||
height: 100%; | ||
} | ||
/* Because the page component has height:100dvh, override it just for the embedded examples */ | ||
.ws-mdx-content-content [id^=ws-core-c-page-] .ws-preview-html .pf-v6-c-page { | ||
height: min-content; | ||
min-height: 30em; | ||
} |
Original file line number | Diff line number | Diff line change | ||||||||||||||||||||
---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
|
@@ -65,11 +65,11 @@ $pf-page-v6--height-breakpoint-map: build-breakpoint-map("base", "sm", "md", "lg | |||||||||||||||||||||
--#{$page}__main-container--BorderColor: var(--#{$page}__main-container--BackgroundColor); // TODO Border should match the background to blend in - change to be a page outline token | ||||||||||||||||||||||
|
||||||||||||||||||||||
// Main section | ||||||||||||||||||||||
--#{$page}__main-section--MarginBlockStart: var(--pf-t--global--spacer--md); | ||||||||||||||||||||||
--#{$page}__main-section--PaddingBlockStart: var(--pf-t--global--spacer--lg); | ||||||||||||||||||||||
--#{$page}__main-section--PaddingInlineEnd: calc(var(--pf-t--global--spacer--lg) - var(--#{$page}__main-container--BorderWidth)); // subtract the border of the main section - TODO, see if we can remove the need for this calc(), or possibly move it down to the property definition so a user can theme this without a calc() | ||||||||||||||||||||||
--#{$page}__main-section--PaddingBlockEnd: 0; | ||||||||||||||||||||||
--#{$page}__main-section--PaddingInlineStart: calc(var(--pf-t--global--spacer--lg) - var(--#{$page}__main-container--BorderWidth)); // subtract the border of the main section | ||||||||||||||||||||||
--#{$page}__main-section--PaddingBlockStart: var(--pf-t--global--spacer--md); | ||||||||||||||||||||||
--#{$page}__main-section--PaddingInlineEnd: var(--pf-t--global--spacer--lg); // This is the intended spacing - the border of the main section will be subtracted | ||||||||||||||||||||||
--#{$page}__main-section--PaddingBlockEnd: var(--pf-t--global--spacer--md); | ||||||||||||||||||||||
--#{$page}__main-section--PaddingInlineStart: var(--pf-t--global--spacer--lg); // This is the intended spacing - the border of the main section will be subtracted | ||||||||||||||||||||||
--#{$page}__main-section--RowGap: var(--pf-t--global--spacer--lg); | ||||||||||||||||||||||
--#{$page}__main-breadcrumb--main-section--PaddingBlockStart: var(--pf-t--global--spacer--md); | ||||||||||||||||||||||
--#{$page}__main-section--BackgroundColor: var(--pf-t--global--background--color--primary--default); | ||||||||||||||||||||||
--#{$page}__main-section--m-secondary--BackgroundColor: var(--pf-t--global--background--color--secondary--default); | ||||||||||||||||||||||
|
@@ -79,6 +79,12 @@ $pf-page-v6--height-breakpoint-map: build-breakpoint-map("base", "sm", "md", "lg | |||||||||||||||||||||
// Limit width | ||||||||||||||||||||||
--#{$page}--section--m-limit-width--MaxWidth: calc(#{pf-size-prem(2000px)} - var(--#{$page}__sidebar--Width)); | ||||||||||||||||||||||
|
||||||||||||||||||||||
// Page main body | ||||||||||||||||||||||
--#{$page}__main-body--MarginBlockStart: 0; | ||||||||||||||||||||||
--#{$page}__main-body--MarginBlockEnd: 0; | ||||||||||||||||||||||
--#{$page}__main-body--PaddingInlineEnd: 0; | ||||||||||||||||||||||
--#{$page}__main-body--PaddingInlineStart: 0; | ||||||||||||||||||||||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Do we still need these? As far as I can tell, doesn't look like they're ever modified. Padding is on the outer |
||||||||||||||||||||||
|
||||||||||||||||||||||
// Sticky | ||||||||||||||||||||||
--#{$page}--section--m-sticky-top--ZIndex: var(--pf-t--global--z-index--md); | ||||||||||||||||||||||
--#{$page}--section--m-sticky-top--BoxShadow: var(--pf-t--global--box-shadow--sm--bottom); | ||||||||||||||||||||||
|
@@ -118,6 +124,7 @@ $pf-page-v6--height-breakpoint-map: build-breakpoint-map("base", "sm", "md", "lg | |||||||||||||||||||||
--#{$page}__main-tabs--PaddingBlockStart: 0; | ||||||||||||||||||||||
--#{$page}__main-tabs--PaddingInlineEnd: 0; | ||||||||||||||||||||||
--#{$page}__main-tabs--PaddingBlockEnd: 0; | ||||||||||||||||||||||
--#{$page}__main-tabs--PaddingInlineStart: 0; | ||||||||||||||||||||||
--#{$page}__main-tabs--BackgroundColor: var(--pf-t--global--background--color--primary--default); | ||||||||||||||||||||||
|
||||||||||||||||||||||
// Wizard main section | ||||||||||||||||||||||
|
@@ -247,7 +254,6 @@ $pf-page-v6--height-breakpoint-map: build-breakpoint-map("base", "sm", "md", "lg | |||||||||||||||||||||
&.pf-m-limit-width { | ||||||||||||||||||||||
display: flex; | ||||||||||||||||||||||
flex-direction: column; | ||||||||||||||||||||||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Since body is required now, wdyt about moving these styles to this block so all of the main-[whatever] sections (anything that has |
||||||||||||||||||||||
padding: 0; | ||||||||||||||||||||||
|
||||||||||||||||||||||
> .#{$page}__main-body { | ||||||||||||||||||||||
flex: 1; | ||||||||||||||||||||||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. |
||||||||||||||||||||||
|
@@ -345,6 +351,7 @@ $pf-page-v6--height-breakpoint-map: build-breakpoint-map("base", "sm", "md", "lg | |||||||||||||||||||||
.#{$page}__main-list { | ||||||||||||||||||||||
display: flex; | ||||||||||||||||||||||
flex-direction: column; | ||||||||||||||||||||||
flex-grow: 1; | ||||||||||||||||||||||
} | ||||||||||||||||||||||
Comment on lines
343
to
347
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I think we can take this out now? I only see it in the hackathon demo code. |
||||||||||||||||||||||
|
||||||||||||||||||||||
.#{$page}__main-nav { | ||||||||||||||||||||||
|
@@ -429,10 +436,13 @@ $pf-page-v6--height-breakpoint-map: build-breakpoint-map("base", "sm", "md", "lg | |||||||||||||||||||||
} | ||||||||||||||||||||||
|
||||||||||||||||||||||
.#{$page}__main-section { | ||||||||||||||||||||||
display: flex; | ||||||||||||||||||||||
flex-direction: column; | ||||||||||||||||||||||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I think you can remove this since you added it here patternfly/src/patternfly/components/Page/page.scss Lines 263 to 272 in bab3e8a
|
||||||||||||||||||||||
gap: var(--#{$page}__main-section--RowGap); | ||||||||||||||||||||||
padding-block-start: var(--#{$page}__main-section--PaddingBlockStart); | ||||||||||||||||||||||
padding-block-end: var(--#{$page}__main-section--PaddingBlockEnd); | ||||||||||||||||||||||
padding-inline-start: var(--#{$page}__main-section--PaddingInlineStart); | ||||||||||||||||||||||
padding-inline-end: var(--#{$page}__main-section--PaddingInlineEnd); | ||||||||||||||||||||||
padding-inline-start: calc(var(--#{$page}__main-section--PaddingInlineStart) - var(--#{$page}__main-container--BorderWidth)); | ||||||||||||||||||||||
padding-inline-end: calc(var(--#{$page}__main-section--PaddingInlineEnd) - var(--#{$page}__main-container--BorderWidth)); | ||||||||||||||||||||||
background-color: var(--#{$page}__main-section--BackgroundColor); | ||||||||||||||||||||||
|
||||||||||||||||||||||
&.pf-m-secondary { | ||||||||||||||||||||||
|
@@ -447,17 +457,17 @@ $pf-page-v6--height-breakpoint-map: build-breakpoint-map("base", "sm", "md", "lg | |||||||||||||||||||||
&.pf-m-padding#{$breakpoint-name} { | ||||||||||||||||||||||
padding-block-start: var(--#{$page}__main-section--PaddingBlockStart); | ||||||||||||||||||||||
padding-block-end: var(--#{$page}__main-section--PaddingBlockEnd); | ||||||||||||||||||||||
padding-inline-start: var(--#{$page}__main-section--PaddingInlineStart); | ||||||||||||||||||||||
padding-inline-end: var(--#{$page}__main-section--PaddingInlineEnd); | ||||||||||||||||||||||
padding-inline-start: calc(var(--#{$page}__main-section--PaddingInlineStart) - var(--#{$page}__main-container--BorderWidth)); | ||||||||||||||||||||||
padding-inline-end: calc(var(--#{$page}__main-section--PaddingInlineEnd) - var(--#{$page}__main-container--BorderWidth)); | ||||||||||||||||||||||
|
||||||||||||||||||||||
&.pf-m-limit-width { | ||||||||||||||||||||||
padding: 0; | ||||||||||||||||||||||
|
||||||||||||||||||||||
.#{$page}__main-body { | ||||||||||||||||||||||
padding-block-start: var(--#{$page}__main-section--PaddingBlockStart); | ||||||||||||||||||||||
padding-block-end: var(--#{$page}__main-section--PaddingBlockEnd); | ||||||||||||||||||||||
padding-inline-start: var(--#{$page}__main-section--PaddingInlineStart); | ||||||||||||||||||||||
padding-inline-end: var(--#{$page}__main-section--PaddingInlineEnd); | ||||||||||||||||||||||
padding-inline-start: calc(var(--#{$page}__main-section--PaddingInlineStart) - var(--#{$page}__main-container--BorderWidth)); | ||||||||||||||||||||||
padding-inline-end: calc(var(--#{$page}__main-section--PaddingInlineEnd) - var(--#{$page}__main-container--BorderWidth)); | ||||||||||||||||||||||
} | ||||||||||||||||||||||
} | ||||||||||||||||||||||
} | ||||||||||||||||||||||
|
@@ -494,28 +504,23 @@ $pf-page-v6--height-breakpoint-map: build-breakpoint-map("base", "sm", "md", "lg | |||||||||||||||||||||
|
||||||||||||||||||||||
.#{$page}__main-body { | ||||||||||||||||||||||
.#{$page}__main-nav & { | ||||||||||||||||||||||
padding-block-start: var(--#{$page}__main-nav--PaddingBlockStart); | ||||||||||||||||||||||
padding-inline-start: var(--#{$page}__main-nav--PaddingInlineStart); | ||||||||||||||||||||||
padding-inline-end: var(--#{$page}__main-nav--PaddingInlineEnd); | ||||||||||||||||||||||
Comment on lines
496
to
498
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. pretty sure you can remove this, it was for tertiary nav, which we removed since it was replaced with horizontal subnav, and we use |
||||||||||||||||||||||
} | ||||||||||||||||||||||
|
||||||||||||||||||||||
.#{$page}__main-breadcrumb & { | ||||||||||||||||||||||
padding-block-start: var(--#{$page}__main-breadcrumb--PaddingBlockStart); | ||||||||||||||||||||||
padding-block-end: var(--#{$page}__main-breadcrumb--PaddingBlockEnd); | ||||||||||||||||||||||
padding-inline-start: var(--#{$page}__main-breadcrumb--PaddingInlineStart); | ||||||||||||||||||||||
padding-inline-end: var(--#{$page}__main-breadcrumb--PaddingInlineEnd); | ||||||||||||||||||||||
padding-inline-start: 0; | ||||||||||||||||||||||
padding-inline-end: 0; | ||||||||||||||||||||||
} | ||||||||||||||||||||||
|
||||||||||||||||||||||
.#{$page}__main-section & { | ||||||||||||||||||||||
padding-block-start: var(--#{$page}__main-section--PaddingBlockStart); | ||||||||||||||||||||||
padding-block-end: var(--#{$page}__main-section--PaddingBlockEnd); | ||||||||||||||||||||||
padding-inline-start: var(--#{$page}__main-section--PaddingInlineStart); | ||||||||||||||||||||||
padding-inline-end: var(--#{$page}__main-section--PaddingInlineEnd); | ||||||||||||||||||||||
padding-inline-start: var(--#{$page}__main-body--PaddingInlineStart); | ||||||||||||||||||||||
padding-inline-end: var(--#{$page}__main-body--PaddingInlineEnd); | ||||||||||||||||||||||
margin-block-start: var(--#{$page}__main-body--MarginBlockStart); | ||||||||||||||||||||||
margin-block-end: var(--#{$page}__main-body--MarginBlockEnd); | ||||||||||||||||||||||
} | ||||||||||||||||||||||
|
||||||||||||||||||||||
.#{$page}__main-tabs & { | ||||||||||||||||||||||
padding-block-start: var(--#{$page}__main-tabs--PaddingBlockStart); | ||||||||||||||||||||||
padding-block-end: var(--#{$page}__main-tabs--PaddingBlockEnd); | ||||||||||||||||||||||
padding-inline-start: var(--#{$page}__main-tabs--PaddingInlineStart); | ||||||||||||||||||||||
padding-inline-end: var(--#{$page}__main-tabs--PaddingInlineEnd); | ||||||||||||||||||||||
} | ||||||||||||||||||||||
|
@@ -528,4 +533,3 @@ $pf-page-v6--height-breakpoint-map: build-breakpoint-map("base", "sm", "md", "lg | |||||||||||||||||||||
flex: 1 0 auto; | ||||||||||||||||||||||
} | ||||||||||||||||||||||
} | ||||||||||||||||||||||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
👍 love the update to hold the actual spacer here. Much better for customization.