@patternfly/react-styles 5.0.0-alpha.4 → 5.0.0-alpha.5

package/css/components/Masthead/masthead.css

@@ -235,6 +235,7 @@
   position: relative;
   display: flex;
   flex-basis: var(--pf-c-masthead__main--FlexBasis);
+  grid-column: var(--pf-c-masthead__main--GridColumn);
   align-items: center;
   align-self: stretch;
   order: var(--pf-c-masthead__main--Order);
@@ -242,7 +243,6 @@
   padding-top: var(--pf-c-masthead__main--PaddingTop);
   padding-bottom: var(--pf-c-masthead__main--PaddingBottom);
   margin-right: var(--pf-c-masthead__main--MarginRight);
-  grid-column: var(--pf-c-masthead__main--GridColumn);
 }
 .pf-c-masthead__main::before {
   position: absolute;
@@ -259,6 +259,9 @@
 .pf-c-masthead__content {
   display: flex;
   flex-grow: 1;
+  flex-shrink: 1;
+  grid-column: var(--pf-c-masthead__content--GridColumn);
+  grid-column-end: -1;
   align-items: center;
   align-self: stretch;
   order: var(--pf-c-masthead__content--Order);
@@ -266,9 +269,6 @@
   padding-top: var(--pf-c-masthead__content--PaddingTop);
   padding-bottom: var(--pf-c-masthead__content--PaddingBottom);
   margin-left: var(--pf-c-masthead__content--MarginLeft);
-  grid-column: var(--pf-c-masthead__content--GridColumn);
-  grid-column-end: -1;
-  flex-shrink: 1;
 }
 .pf-c-masthead__content:only-child {
   --pf-c-masthead__content--MarginLeft: 0;

package/css/components/Menu/menu.css

@@ -182,12 +182,6 @@
   --pf-c-menu--m-scrollable__footer--BoxShadow: var(--pf-global--BoxShadow--sm-top);
   --pf-c-menu--m-scrollable__footer--after--BorderTopWidth: 0;
   --pf-c-menu--m-scrollable__footer--after--BorderBottomWidth: var(--pf-global--BorderWidth--sm);
-  top: var(--pf-c-menu--Top);
-  z-index: var(--pf-c-menu--ZIndex);
-  width: var(--pf-c-menu--Width);
-  min-width: var(--pf-c-menu--MinWidth);
-  background-color: var(--pf-c-menu--BackgroundColor);
-  box-shadow: var(--pf-c-menu--BoxShadow);
   --pf-c-menu--m-nav--BoxShadow: var(--pf-global--BoxShadow--lg);
   --pf-c-menu--m-nav--BackgroundColor: var(--pf-global--BackgroundColor--dark-300);
   --pf-c-menu--m-nav__list--PaddingTop: 0;
@@ -215,6 +209,12 @@
   --pf-c-menu--m-nav--c-menu--m-left--Right: calc(100% - var(--pf-c-menu--m-nav--c-menu--m-left--right-offset));
   --pf-c-menu--m-nav--c-menu--m-top--Bottom: calc(0 + var(--pf-c-menu--m-nav--c-menu--m-top--bottom-offset));
   --pf-c-menu--m-nav__list-item--first-child--c-menu--Top: 0;
+  top: var(--pf-c-menu--Top);
+  z-index: var(--pf-c-menu--ZIndex);
+  width: var(--pf-c-menu--Width);
+  min-width: var(--pf-c-menu--MinWidth);
+  background-color: var(--pf-c-menu--BackgroundColor);
+  box-shadow: var(--pf-c-menu--BoxShadow);
 }
 .pf-c-menu .pf-c-menu__content .pf-c-menu .pf-c-menu__content {
   overflow: visible;

package/css/components/MenuToggle/menu-toggle.css

@@ -368,8 +368,8 @@
 
 .pf-c-menu-toggle__icon {
   display: inline-flex;
-  align-self: center;
   flex-shrink: 0;
+  align-self: center;
   margin-right: var(--pf-c-menu-toggle__icon--MarginRight);
   line-height: 1;
 }

package/css/components/MultipleFileUpload/multiple-file-upload.css

@@ -62,8 +62,8 @@
   --pf-c-multiple-file-upload__status-item-progress-text--Color: var(--pf-global--primary-color--100);
   --pf-c-multiple-file-upload__status-item-progress-size--Color: var(--pf-global--Color--200);
   display: grid;
-  gap: var(--pf-c-multiple-file-upload--Gap);
   grid-template-columns: var(--pf-c-multiple-file-upload--GridTemplateColumns);
+  gap: var(--pf-c-multiple-file-upload--Gap);
 }
 .pf-c-multiple-file-upload.pf-m-horizontal {
   --pf-c-multiple-file-upload--GridTemplateColumns: var(--pf-c-multiple-file-upload--m-horizontal--GridTemplateColumns);
@@ -89,21 +89,21 @@
 
 .pf-c-multiple-file-upload__main {
   display: grid;
+  grid-template-areas: var(--pf-c-multiple-file-upload__main--GridTemplateAreas);
+  grid-template-rows: var(--pf-c-multiple-file-upload__main--GridTemplateRows);
+  grid-template-columns: var(--pf-c-multiple-file-upload__main--GridTemplateColumns);
+  gap: var(--pf-c-multiple-file-upload__main--Gap);
   padding: var(--pf-c-multiple-file-upload__main--PaddingTop) var(--pf-c-multiple-file-upload__main--PaddingRight) var(--pf-c-multiple-file-upload__main--PaddingBottom) var(--pf-c-multiple-file-upload__main--PaddingLeft);
   text-align: var(--pf-c-multiple-file-upload__main--TextAlign);
   background-color: var(--pf-c-multiple-file-upload__main--BackgroundColor);
   border: var(--pf-c-multiple-file-upload__main--BorderWidth) var(--pf-c-multiple-file-upload__main--BorderStyle) var(--pf-c-multiple-file-upload__main--BorderColor);
-  grid-template-columns: var(--pf-c-multiple-file-upload__main--GridTemplateColumns);
-  grid-template-rows: var(--pf-c-multiple-file-upload__main--GridTemplateRows);
-  grid-template-areas: var(--pf-c-multiple-file-upload__main--GridTemplateAreas);
-  gap: var(--pf-c-multiple-file-upload__main--Gap);
 }
 
 .pf-c-multiple-file-upload__title {
   display: var(--pf-c-multiple-file-upload__title--Display);
+  grid-area: title;
   grid-template-columns: var(--pf-c-multiple-file-upload__title--GridTemplateColumns);
   gap: var(--pf-c-multiple-file-upload__title--Gap);
-  grid-area: title;
 }
 
 .pf-c-multiple-file-upload__title-icon {

package/css/components/Nav/nav.css

@@ -862,8 +862,8 @@
   --pf-c-nav__link--focus--after--BorderLeftWidth: var(--pf-c-nav__section__link--focus--after--BorderWidth);
   --pf-c-nav__link--active--after--BorderLeftWidth: var(--pf-c-nav__section__link--active--after--BorderWidth);
   --pf-c-nav__link--m-current--after--BorderLeftWidth: var(--pf-c-nav__section__link--m-current--after--BorderWidth);
-  margin-top: var(--pf-c-nav__section--MarginTop);
   --pf-c-nav--c-divider--MarginBottom: 0;
+  margin-top: var(--pf-c-nav__section--MarginTop);
 }
 .pf-c-nav__section + .pf-c-nav__section {
   --pf-c-nav__section--MarginTop: var(--pf-c-nav__section--section--MarginTop);

package/css/components/NotificationDrawer/notification-drawer.css

@@ -169,9 +169,9 @@
 
 .pf-c-notification-drawer__list-item-header {
   display: flex;
-  align-items: baseline;
-  grid-column: 1/2;
   grid-row: 1/2;
+  grid-column: 1/2;
+  align-items: baseline;
   margin-bottom: var(--pf-c-notification-drawer__list-item-header--MarginBottom);
 }
 
@@ -192,8 +192,8 @@
 }
 
 .pf-c-notification-drawer__list-item-action {
-  grid-column: 2/3;
   grid-row: 1/3;
+  grid-column: 2/3;
 }
 
 .pf-c-notification-drawer__list-item-description {

package/css/components/OptionsMenu/options-menu.css

@@ -5,7 +5,6 @@
   --pf-c-options-menu__toggle--PaddingBottom: var(--pf-global--spacer--form-element);
   --pf-c-options-menu__toggle--PaddingLeft: var(--pf-global--spacer--sm);
   --pf-c-options-menu__toggle--MinWidth: 0;
-  --pf-c-options-menu__toggle--LineHeight: var(--pf-global--LineHeight--md);
   --pf-c-options-menu__toggle--BorderWidth: var(--pf-global--BorderWidth--sm);
   --pf-c-options-menu__toggle--BorderTopColor: var(--pf-global--BorderColor--300);
   --pf-c-options-menu__toggle--BorderRightColor: var(--pf-global--BorderColor--300);
@@ -113,7 +112,6 @@
   min-width: var(--pf-c-options-menu__toggle--MinWidth);
   max-width: 100%;
   padding: var(--pf-c-options-menu__toggle--PaddingTop) var(--pf-c-options-menu__toggle--PaddingRight) var(--pf-c-options-menu__toggle--PaddingBottom) var(--pf-c-options-menu__toggle--PaddingLeft);
-  line-height: var(--pf-c-options-menu__toggle--LineHeight);
   color: var(--pf-c-options-menu__toggle--Color);
   background-color: var(--pf-c-options-menu__toggle--BackgroundColor);
   border: none;
@@ -131,9 +129,6 @@
   display: inline-block;
   color: var(--pf-c-options-menu__toggle--m-plain--Color);
 }
-.pf-c-options-menu__toggle.pf-m-plain:not(.pf-m-text) .pf-c-options-menu__toggle-button-icon {
-  line-height: var(--pf-c-options-menu__toggle--LineHeight);
-}
 .pf-c-options-menu__toggle.pf-m-plain:hover, .pf-c-options-menu__toggle.pf-m-plain:active, .pf-c-options-menu__toggle.pf-m-plain.pf-m-active, .pf-c-options-menu__toggle.pf-m-plain:focus, .pf-c-options-menu.pf-m-expanded > .pf-c-options-menu__toggle.pf-m-plain {
   --pf-c-options-menu__toggle--m-plain--Color: var(--pf-c-options-menu__toggle--m-plain--hover--Color);
   --pf-c-options-menu--m-plain__toggle-icon--Color: var(--pf-c-options-menu--m-plain--hover__toggle-icon--Color);

package/css/components/Page/page.css

@@ -201,10 +201,10 @@
   --pf-c-page__main-wizard--BorderTopWidth: var(--pf-global--BorderWidth--sm);
   --pf-c-page__main-wizard--m-light-200--BackgroundColor: var(--pf-global--BackgroundColor--200);
   display: grid;
-  height: 100%;
-  grid-template-columns: 1fr;
-  grid-template-rows: max-content 1fr;
   grid-template-areas: "header" "main";
+  grid-template-rows: max-content 1fr;
+  grid-template-columns: 1fr;
+  height: 100%;
   background-color: var(--pf-c-page--BackgroundColor);
 }
 @media (min-width: 1200px) {
@@ -251,8 +251,8 @@
 }
 @media (min-width: 1200px) {
   .pf-c-page {
-    grid-template-columns: max-content 1fr;
     grid-template-areas: "header header" "nav main";
+    grid-template-columns: max-content 1fr;
   }
 }
 .pf-c-page.pf-m-full-height {
@@ -263,14 +263,14 @@
 
 .pf-c-page__header,
 .pf-c-page > .pf-c-masthead {
-  grid-area: header;
   z-index: var(--pf-c-page__header--ZIndex);
+  grid-area: header;
 }
 
 .pf-c-page__header {
   color: var(--pf-global--Color--100);
-  grid-template-columns: auto auto;
   display: grid;
+  grid-template-columns: auto auto;
   align-items: center;
   min-width: 0;
   min-height: var(--pf-c-page__header--MinHeight);
@@ -318,18 +318,18 @@
 }
 
 .pf-c-page__header-nav {
+  grid-row: 2/3;
+  grid-column: 1/-1;
   align-self: stretch;
   min-width: 0;
   padding-right: var(--pf-c-page__header-nav--PaddingRight);
   padding-left: var(--pf-c-page__header-nav--PaddingLeft);
   background-color: var(--pf-c-page__header-nav--BackgroundColor);
-  grid-column: 1/-1;
-  grid-row: 2/3;
 }
 @media screen and (min-width: 1200px) {
   .pf-c-page__header-nav {
-    grid-column: 2/3;
     grid-row: 1/2;
+    grid-column: 2/3;
   }
 }
 .pf-c-page__header-nav .pf-c-nav {
@@ -395,10 +395,10 @@
 }
 
 .pf-c-page__sidebar {
+  z-index: var(--pf-c-page__sidebar--ZIndex);
   grid-area: nav;
   grid-row-start: 2;
   grid-column-start: 1;
-  z-index: var(--pf-c-page__sidebar--ZIndex);
   width: var(--pf-c-page__sidebar--Width);
   overflow-x: hidden;
   overflow-y: auto;
@@ -678,8 +678,8 @@
 
 .pf-c-page__main,
 .pf-c-page__drawer {
-  grid-area: main;
   z-index: var(--pf-c-page__main--ZIndex);
+  grid-area: main;
   overflow-x: hidden;
   overflow-y: auto;
   -webkit-overflow-scrolling: touch;

package/css/components/Popover/popover.css

@@ -43,6 +43,7 @@
   --pf-c-popover__title-text--FontSize: var(--pf-global--FontSize--md);
   --pf-c-popover__title-icon--MarginRight: var(--pf-global--spacer--sm);
   --pf-c-popover__title-icon--Color: var(--pf-global--Color--100);
+  --pf-c-popover__title-icon--FontSize: var(--pf-global--FontSize--md);
   --pf-c-popover__footer--MarginTop: var(--pf-global--spacer--md);
   position: relative;
   min-width: var(--pf-c-popover--MinWidth);
@@ -150,6 +151,7 @@
 
 .pf-c-popover__title-icon {
   margin-right: var(--pf-c-popover__title-icon--MarginRight);
+  font-size: var(--pf-c-popover__title-icon--FontSize);
   color: var(--pf-c-popover__title-icon--Color);
 }
 

package/css/components/Progress/progress.css

@@ -27,10 +27,10 @@
   --pf-c-progress--m-sm__measure--FontSize: var(--pf-global--FontSize--sm);
   --pf-c-progress--m-lg__bar--Height: var(--pf-global--spacer--lg);
   display: grid;
-  align-items: end;
-  grid-gap: var(--pf-c-progress--GridGap);
-  grid-template-columns: auto auto;
   grid-template-rows: 1fr auto;
+  grid-template-columns: auto auto;
+  grid-gap: var(--pf-c-progress--GridGap);
+  align-items: end;
 }
 .pf-c-progress.pf-m-sm {
   --pf-c-progress__bar--Height: var(--pf-c-progress--m-sm__bar--Height);
@@ -59,8 +59,8 @@
   grid-column: 1/3;
 }
 .pf-c-progress.pf-m-outside .pf-c-progress__status {
-  grid-column: 2/3;
   grid-row: 2/3;
+  grid-column: 2/3;
   align-self: center;
 }
 .pf-c-progress.pf-m-outside .pf-c-progress__measure {
@@ -108,8 +108,8 @@
 }
 
 .pf-c-progress__description {
-  word-break: break-word;
   grid-column: 1/2;
+  word-break: break-word;
 }
 .pf-c-progress__description.pf-m-truncate {
   overflow: hidden;
@@ -119,13 +119,13 @@
 
 .pf-c-progress__status {
   display: flex;
+  grid-row: 1/2;
+  grid-column: 2/3;
+  gap: var(--pf-c-progress__status--Gap);
   align-items: flex-start;
   justify-content: flex-end;
-  grid-column: 2/3;
-  grid-row: 1/2;
   text-align: right;
   word-break: break-word;
-  gap: var(--pf-c-progress__status--Gap);
 }
 
 .pf-c-progress__status-icon {
@@ -134,8 +134,8 @@
 
 .pf-c-progress__bar {
   position: relative;
-  grid-column: 1/3;
   grid-row: 2/3;
+  grid-column: 1/3;
   align-self: center;
   height: var(--pf-c-progress__bar--Height);
   background-color: var(--pf-c-progress__bar--BackgroundColor);
@@ -160,8 +160,8 @@
 }
 
 .pf-c-progress__helper-text {
-  grid-column: 1/3;
   grid-row: 3/4;
+  grid-column: 1/3;
   margin-top: var(--pf-c-progress__helper-text--MarginTop);
 }
 

package/css/components/ProgressStepper/progress-stepper.css

@@ -114,10 +114,10 @@
   --pf-c-progress-stepper--m-center__step-main--before--Content: "";
   position: relative;
   display: grid;
-  grid-auto-flow: var(--pf-c-progress-stepper--GridAutoFlow);
-  grid-template-columns: var(--pf-c-progress-stepper--GridTemplateColumns);
   grid-template-rows: var(--pf-c-progress-stepper--GridTemplateRows);
+  grid-template-columns: var(--pf-c-progress-stepper--GridTemplateColumns);
   grid-auto-columns: 1fr;
+  grid-auto-flow: var(--pf-c-progress-stepper--GridAutoFlow);
 }
 @media screen and (min-width: 768px) {
   .pf-c-progress-stepper {
@@ -184,8 +184,8 @@
   grid-auto-flow: var(--pf-c-progress-stepper--m-compact--GridAutoFlow);
 }
 .pf-c-progress-stepper.pf-m-compact .pf-c-progress-stepper__step-connector {
-  min-width: var(--pf-c-progress-stepper--m-compact__step-connector--MinWidth);
   grid-row: var(--pf-c-progress-stepper--m-compact__step-connector--GridRow);
+  min-width: var(--pf-c-progress-stepper--m-compact__step-connector--MinWidth);
   padding-bottom: var(--pf-c-progress-stepper--m-compact__step-connector--PaddingBottom);
 }
 .pf-c-progress-stepper.pf-m-compact .pf-c-progress-stepper__step-main {
@@ -302,11 +302,11 @@
 }
 .pf-c-progress-stepper__step-title.pf-m-help-text {
   text-decoration: underline;
-  cursor: pointer;
+  text-decoration-thickness: var(--pf-c-progress-stepper__step-title--m-help-text--TextDecorationThickness);
   text-decoration-style: dashed;
   text-decoration-color: var(--pf-c-progress-stepper__step-title--m-help-text--TextDecorationColor);
-  text-decoration-thickness: var(--pf-c-progress-stepper__step-title--m-help-text--TextDecorationThickness);
   text-underline-offset: var(--pf-c-progress-stepper__step-title--m-help-text--TextUnderlineOffset);
+  cursor: pointer;
 }
 .pf-c-progress-stepper__step-title.pf-m-help-text:hover {
   --pf-c-progress-stepper__step-title--Color: var(--pf-c-progress-stepper__step-title--m-help-text--hover--Color);

package/css/components/SearchInput/search-input.css

@@ -57,9 +57,9 @@
 
 .pf-c-search-input__text {
   display: grid;
-  grid-template-columns: 1fr;
-  grid-template-areas: "text-input";
   flex: 1;
+  grid-template-areas: "text-input";
+  grid-template-columns: 1fr;
 }
 .pf-c-search-input__text::before, .pf-c-search-input__text::after {
   position: absolute;

package/css/components/Select/select.css

@@ -356,8 +356,8 @@
 .pf-c-select__toggle-typeahead {
   flex-basis: var(--pf-c-select__toggle-typeahead--FlexBasis);
   flex-grow: 1;
-  min-width: var(--pf-c-select__toggle-typeahead--MinWidth);
   flex-shrink: 0;
+  min-width: var(--pf-c-select__toggle-typeahead--MinWidth);
 }
 .pf-c-select__toggle-typeahead.pf-c-form-control {
   background-color: var(--pf-c-select__toggle-typeahead--BackgroundColor);

package/css/components/Sidebar/sidebar.css

@@ -1,26 +1,52 @@
 .pf-c-sidebar {
+  --pf-c-sidebar--inset: var(--pf-global--spacer--md);
+  --pf-c-sidebar--xl--inset: var(--pf-global--spacer--lg);
   --pf-c-sidebar--BackgroundColor: var(--pf-global--BackgroundColor--100);
+  --pf-c-sidebar--BorderWidth--base: var(--pf-global--BorderWidth--sm);
+  --pf-c-sidebar--BorderColor--base: var(--pf-global--BorderColor--100);
+  --pf-c-sidebar__panel--PaddingTop: 0;
+  --pf-c-sidebar__panel--PaddingRight: 0;
+  --pf-c-sidebar__panel--PaddingBottom: 0;
+  --pf-c-sidebar__panel--PaddingLeft: 0;
+  --pf-c-sidebar__panel--Order: -1;
+  --pf-c-sidebar__panel--m-padding--PaddingTop: var(--pf-c-sidebar--inset);
+  --pf-c-sidebar__panel--m-padding--PaddingRight: var(--pf-c-sidebar--inset);
+  --pf-c-sidebar__panel--m-padding--PaddingBottom: var(--pf-c-sidebar--inset);
+  --pf-c-sidebar__panel--m-padding--PaddingLeft: var(--pf-c-sidebar--inset);
+  --pf-c-sidebar__content--PaddingTop: 0;
+  --pf-c-sidebar__content--PaddingRight: 0;
+  --pf-c-sidebar__content--PaddingBottom: 0;
+  --pf-c-sidebar__content--PaddingLeft: 0;
+  --pf-c-sidebar__content--Order: 1;
+  --pf-c-sidebar__content--m-padding--PaddingTop: var(--pf-c-sidebar--inset);
+  --pf-c-sidebar__content--m-padding--PaddingRight: var(--pf-c-sidebar--inset);
+  --pf-c-sidebar__content--m-padding--PaddingBottom: var(--pf-c-sidebar--inset);
+  --pf-c-sidebar__content--m-padding--PaddingLeft: var(--pf-c-sidebar--inset);
   --pf-c-sidebar__main--FlexDirection: column;
   --pf-c-sidebar__main--md--FlexDirection: row;
   --pf-c-sidebar__main--AlignItems: stretch;
   --pf-c-sidebar__main--md--AlignItems: start;
   --pf-c-sidebar__main--child--MarginTop: 0;
-  --pf-c-sidebar__main--child--MarginLeft: 0;
-  --pf-c-sidebar--m-gutter__main--Gap: var(--pf-global--spacer--md);
-  --pf-c-sidebar--m-gutter__main--xl--Gap: var(--pf-global--spacer--lg);
-  --pf-c-sidebar--m-panel-right__panel--Order: 0;
+  --pf-c-sidebar--m-gutter__main--Gap: var(--pf-c-sidebar--inset);
+  --pf-c-sidebar__main--m-border--before--Display: none;
+  --pf-c-sidebar__main--m-border--before--md--Display: block;
+  --pf-c-sidebar__main--m-border--before--BorderWidth: var(--pf-c-sidebar--BorderWidth--base);
+  --pf-c-sidebar__main--m-border--before--BorderColor: var(--pf-c-sidebar--BorderColor--base);
+  --pf-c-sidebar--m-panel-right__panel--Order: -1;
   --pf-c-sidebar--m-panel-right__panel--md--Order: 1;
+  --pf-c-sidebar--m-panel-right__content--md--Order: -1;
   --pf-c-sidebar--m-stack__main--FlexDirection: column;
   --pf-c-sidebar--m-stack__main--AlignItems: stretch;
   --pf-c-sidebar--m-stack__panel--Position: sticky;
   --pf-c-sidebar--m-stack__panel--Top: 0;
   --pf-c-sidebar--m-stack__panel--BoxShadow: var(--pf-c-sidebar__panel--BoxShadow--base);
-  --pf-c-sidebar--m-stack--m-panel-right__panel--Order: 0;
+  --pf-c-sidebar--m-stack--m-panel-right__panel--Order: -1;
   --pf-c-sidebar--m-split__main--AlignItems: start;
   --pf-c-sidebar--m-split__main--FlexDirection: row;
   --pf-c-sidebar--m-split__panel--Position: static;
   --pf-c-sidebar--m-split__panel--Top: auto;
   --pf-c-sidebar--m-split--m-panel-right__panel--Order: 1;
+  --pf-c-sidebar--m-split__main--m-border--before--Display: block;
   --pf-c-sidebar__panel--FlexBasis--base: auto;
   --pf-c-sidebar__panel--BoxShadow--base: 0 0.25rem 0.25rem -0.25rem rgba(3, 3, 3, 0.16);
   --pf-c-sidebar__panel--BoxShadow: var(--pf-c-sidebar__panel--BoxShadow--base);
@@ -34,7 +60,6 @@
   --pf-c-sidebar__panel--m-split--FlexBasis: 15.625rem;
   --pf-c-sidebar__panel--m-stack--FlexBasis: auto;
   --pf-c-sidebar__panel--ZIndex: var(--pf-global--ZIndex--xs);
-  --pf-c-sidebar__panel--Order: 0;
   --pf-c-sidebar__panel--BackgroundColor: var(--pf-global--BackgroundColor--100);
   --pf-c-sidebar__content--BackgroundColor: var(--pf-global--BackgroundColor--100);
   --pf-c-sidebar__panel--m-sticky--Top: 0;
@@ -44,60 +69,50 @@
 @media (min-width: 768px) {
   .pf-c-sidebar {
     --pf-c-sidebar__main--FlexDirection: var(--pf-c-sidebar__main--md--FlexDirection);
+    --pf-c-sidebar__main--AlignItems: var(--pf-c-sidebar__main--md--AlignItems);
+    --pf-c-sidebar__main--m-border--before--Display: var(--pf-c-sidebar__main--m-border--before--md--Display);
     --pf-c-sidebar__panel--BoxShadow: none;
     --pf-c-sidebar__panel--FlexBasis: var(--pf-c-sidebar__panel--md--FlexBasis);
-    --pf-c-sidebar__main--AlignItems: var(--pf-c-sidebar__main--md--AlignItems);
     --pf-c-sidebar__panel--Top: var(--pf-c-sidebar__panel--md--Top);
     --pf-c-sidebar__panel--Position: var(--pf-c-sidebar__panel--md--Position);
   }
 }
 @media (min-width: 1200px) {
   .pf-c-sidebar {
-    --pf-c-sidebar--m-gutter__main--Gap: var(--pf-c-sidebar--m-gutter__main--xl--Gap);
+    --pf-c-sidebar--inset: var(--pf-c-sidebar--xl--inset);
   }
 }
-.pf-c-sidebar.pf-m-gutter {
-  --pf-c-sidebar__main--child--MarginTop: var(--pf-c-sidebar--m-gutter__main--Gap);
-  --pf-c-sidebar__main--child--MarginLeft: 0;
-}
-.pf-c-sidebar.pf-m-gutter > .pf-c-sidebar__main > * + * {
-  margin-top: var(--pf-c-sidebar__main--child--MarginTop);
-  margin-left: var(--pf-c-sidebar__main--child--MarginLeft);
-}
-@media (min-width: 768px) {
-  .pf-c-sidebar.pf-m-gutter {
-    --pf-c-sidebar__main--child--MarginTop: 0;
-    --pf-c-sidebar__main--child--MarginLeft: var(--pf-c-sidebar--m-gutter__main--Gap);
-  }
+.pf-c-sidebar.pf-m-gutter > .pf-c-sidebar__main {
+  gap: var(--pf-c-sidebar--m-gutter__main--Gap);
 }
 .pf-c-sidebar.pf-m-panel-right {
   --pf-c-sidebar__panel--Order: var(--pf-c-sidebar--m-panel-right__panel--Order);
+  --pf-c-sidebar__content--Order: var(--pf-c-sidebar--m-panel-right__content--Order);
 }
 @media (min-width: 768px) {
   .pf-c-sidebar.pf-m-panel-right {
     --pf-c-sidebar--m-panel-right__panel--Order: var(--pf-c-sidebar--m-panel-right__panel--md--Order);
+    --pf-c-sidebar--m-panel-right__content--Order: var(--pf-c-sidebar--m-panel-right__content--md--Order);
   }
 }
 .pf-c-sidebar.pf-m-stack {
   --pf-c-sidebar__main--FlexDirection: var(--pf-c-sidebar--m-stack__main--FlexDirection);
   --pf-c-sidebar__main--AlignItems: var(--pf-c-sidebar--m-stack__main--AlignItems);
-  --pf-c-sidebar__main--child--MarginTop: var(--pf-c-sidebar--m-gutter__main--Gap);
-  --pf-c-sidebar__main--child--MarginLeft: 0;
   --pf-c-sidebar__panel--Position: var(--pf-c-sidebar--m-stack__panel--Position);
   --pf-c-sidebar__panel--Top: var(--pf-c-sidebar--m-stack__panel--Top);
   --pf-c-sidebar__panel--BoxShadow: var(--pf-c-sidebar--m-stack__panel--BoxShadow);
   --pf-c-sidebar__panel--FlexBasis: var(--pf-c-sidebar__panel--m-stack--FlexBasis);
+  --pf-c-sidebar__main--m-border--before--Display: none;
   --pf-c-sidebar--m-panel-right__panel--Order: var(--pf-c-sidebar--m-stack--m-panel-right__panel--Order);
 }
 .pf-c-sidebar.pf-m-split {
   --pf-c-sidebar__main--FlexDirection: var(--pf-c-sidebar--m-split__main--FlexDirection);
   --pf-c-sidebar__main--AlignItems: var(--pf-c-sidebar--m-split__main--AlignItems);
-  --pf-c-sidebar__main--child--MarginTop: 0;
-  --pf-c-sidebar__main--child--MarginLeft: var(--pf-c-sidebar--m-gutter__main--Gap);
   --pf-c-sidebar__panel--Position: var(--pf-c-sidebar--m-split__panel--Position);
   --pf-c-sidebar__panel--Top: var(--pf-c-sidebar--m-split__panel--Top);
   --pf-c-sidebar__panel--BoxShadow: none;
   --pf-c-sidebar__panel--FlexBasis: var(--pf-c-sidebar__panel--m-split--FlexBasis);
+  --pf-c-sidebar__main--m-border--before--Display: var(--pf-c-sidebar--m-split__main--m-border--before--Display);
   --pf-c-sidebar--m-panel-right__panel--Order: var(--pf-c-sidebar--m-split--m-panel-right__panel--Order);
 }
 
@@ -106,17 +121,31 @@
   flex-direction: var(--pf-c-sidebar__main--FlexDirection);
   align-items: var(--pf-c-sidebar__main--AlignItems);
 }
+.pf-c-sidebar__main.pf-m-border::before {
+  display: var(--pf-c-sidebar__main--m-border--before--Display);
+  flex: 0 0 var(--pf-c-sidebar__main--m-border--before--BorderWidth);
+  align-self: stretch;
+  content: "";
+  background-color: var(--pf-c-sidebar__main--m-border--before--BorderColor);
+}
 
 .pf-c-sidebar__panel {
   position: var(--pf-c-sidebar__panel--Position);
   top: var(--pf-c-sidebar__panel--Top);
   z-index: var(--pf-c-sidebar__panel--ZIndex);
-  flex-shrink: 0;
   flex-basis: var(--pf-c-sidebar__panel--FlexBasis);
+  flex-shrink: 0;
   order: var(--pf-c-sidebar__panel--Order);
+  padding: var(--pf-c-sidebar__panel--PaddingTop) var(--pf-c-sidebar__panel--PaddingRight) var(--pf-c-sidebar__panel--PaddingBottom) var(--pf-c-sidebar__panel--PaddingLeft);
   background-color: var(--pf-c-sidebar__panel--BackgroundColor);
   box-shadow: var(--pf-c-sidebar__panel--BoxShadow);
 }
+.pf-c-sidebar__panel.pf-m-padding {
+  --pf-c-sidebar__panel--PaddingTop: var(--pf-c-sidebar__panel--m-padding--PaddingTop);
+  --pf-c-sidebar__panel--PaddingRight: var(--pf-c-sidebar__panel--m-padding--PaddingRight);
+  --pf-c-sidebar__panel--PaddingBottom: var(--pf-c-sidebar__panel--m-padding--PaddingBottom);
+  --pf-c-sidebar__panel--PaddingLeft: var(--pf-c-sidebar__panel--m-padding--PaddingLeft);
+}
 .pf-c-sidebar__panel.pf-m-sticky {
   --pf-c-sidebar__panel--Position: var(--pf-c-sidebar__panel--m-sticky--Position);
   --pf-c-sidebar__panel--Top: var(--pf-c-sidebar__panel--m-sticky--Top);
@@ -128,11 +157,25 @@
 
 .pf-c-sidebar__content {
   flex-grow: 1;
+  order: var(--pf-c-sidebar__content--Order);
+  padding: var(--pf-c-sidebar__content--PaddingTop) var(--pf-c-sidebar__content--PaddingRight) var(--pf-c-sidebar__content--PaddingBottom) var(--pf-c-sidebar__content--PaddingLeft);
   background-color: var(--pf-c-sidebar__content--BackgroundColor);
 }
+.pf-c-sidebar__content.pf-m-padding {
+  --pf-c-sidebar__content--PaddingTop: var(--pf-c-sidebar__content--m-padding--PaddingTop);
+  --pf-c-sidebar__content--PaddingRight: var(--pf-c-sidebar__content--m-padding--PaddingRight);
+  --pf-c-sidebar__content--PaddingBottom: var(--pf-c-sidebar__content--m-padding--PaddingBottom);
+  --pf-c-sidebar__content--PaddingLeft: var(--pf-c-sidebar__content--m-padding--PaddingTop);
+}
 .pf-c-sidebar__content.pf-m-no-background {
   --pf-c-sidebar__content--BackgroundColor: transparent;
 }
+.pf-c-sidebar__content + .pf-c-sidebar__panel {
+  --pf-c-sidebar__panel--Order: 1;
+}
+:where(.pf-c-sidebar__content:first-child) {
+  --pf-c-sidebar__content--Order: -1;
+}
 
 .pf-c-sidebar.pf-m-no-background,
 .pf-c-sidebar__panel.pf-m-no-background,

package/css/components/Sidebar/sidebar.d.ts

@@ -5,6 +5,8 @@ declare const _default: {
     "panelRight": "pf-m-panel-right",
     "stack": "pf-m-stack",
     "split": "pf-m-split",
+    "border": "pf-m-border",
+    "padding": "pf-m-padding",
     "sticky": "pf-m-sticky",
     "static": "pf-m-static",
     "noBackground": "pf-m-no-background",

package/css/components/Sidebar/sidebar.js

@@ -7,6 +7,8 @@ exports.default = {
     "panelRight": "pf-m-panel-right",
     "stack": "pf-m-stack",
     "split": "pf-m-split",
+    "border": "pf-m-border",
+    "padding": "pf-m-padding",
     "sticky": "pf-m-sticky",
     "static": "pf-m-static",
     "noBackground": "pf-m-no-background",

package/css/components/Sidebar/sidebar.mjs

@@ -5,6 +5,8 @@ export default {
     "panelRight": "pf-m-panel-right",
     "stack": "pf-m-stack",
     "split": "pf-m-split",
+    "border": "pf-m-border",
+    "padding": "pf-m-padding",
     "sticky": "pf-m-sticky",
     "static": "pf-m-static",
     "noBackground": "pf-m-no-background",

package/css/components/SimpleList/simple-list.css

@@ -40,9 +40,9 @@
   border: none;
 }
 .pf-c-simple-list__item-link:hover {
-  text-decoration: none;
   --pf-c-simple-list__item-link--BackgroundColor: var(--pf-c-simple-list__item-link--hover--BackgroundColor);
   --pf-c-simple-list__item-link--Color: var(--pf-c-simple-list__item-link--hover--Color);
+  text-decoration: none;
 }
 .pf-c-simple-list__item-link:focus {
   --pf-c-simple-list__item-link--FontWeight: var(--pf-c-simple-list__item-link--focus--FontWeight);

package/css/components/Spinner/spinner.css

@@ -187,13 +187,13 @@ svg.pf-c-spinner.pf-m-xl {
 .pf-c-spinner__path {
   width: 100%;
   height: 100%;
-  transform-origin: 50% 50%;
-  animation: pf-c-spinner-animation-dash var(--pf-c-spinner--AnimationDuration) var(--pf-c-spinner__path--AnimationTimingFunction) infinite;
   stroke: var(--pf-c-spinner--Color);
-  stroke-linecap: round;
   stroke-dasharray: 283;
   stroke-dashoffset: 280;
+  stroke-linecap: round;
   stroke-width: var(--pf-c-spinner--stroke-width);
+  transform-origin: 50% 50%;
+  animation: pf-c-spinner-animation-dash var(--pf-c-spinner--AnimationDuration) var(--pf-c-spinner__path--AnimationTimingFunction) infinite;
 }
 
 @keyframes pf-c-spinner-animation-rotate {
@@ -213,8 +213,8 @@ svg.pf-c-spinner.pf-m-xl {
     stroke-width: calc(var(--pf-c-spinner__path--StrokeWidth) - 4);
   }
   40% {
-    stroke-dashoffset: 150;
     stroke-dasharray: 220;
+    stroke-dashoffset: 150;
   }
   100% {
     stroke-dashoffset: 280;