@patternfly/patternfly 5.0.0-alpha.24 → 5.0.0-alpha.26

package/components/Divider/divider.css

@@ -72,9 +72,9 @@
   width: 100%;
   height: auto;
   flex-direction: var(--pf-c-divider--FlexDirection);
+  flex-shrink: 0;
   align-items: center;
   align-self: stretch;
-  flex-shrink: 0;
   justify-content: center;
   border: 0;
 }
@@ -83,11 +83,11 @@
 }
 .pf-c-divider::after {
   align-self: stretch;
+  justify-self: center;
   width: var(--pf-c-divider--after--Width);
   height: var(--pf-c-divider--after--Height);
   content: "";
   background-color: var(--pf-c-divider--after--BackgroundColor);
-  justify-self: center;
 }
 .pf-c-divider.pf-m-vertical {
   --pf-c-divider--Display: var(--pf-c-divider--m-vertical--Display);

package/components/Divider/divider.scss

@@ -67,19 +67,19 @@ $pf-c-divider--spacer-map: build-spacer-map("none", "xs", "sm", "md", "lg", "xl"
   @include pf-c-divider--m-horizontal; // set to default to horizontal
 
   flex-direction: var(--pf-c-divider--FlexDirection);
+  flex-shrink: 0;
   align-items: center;
   align-self: stretch;
-  flex-shrink: 0;
   justify-content: center;
   border: 0; // removes the default border styling on an hr
 
   &::after {
     align-self: stretch;
+    justify-self: center;
     width: var(--pf-c-divider--after--Width);
     height: var(--pf-c-divider--after--Height);
     content: "";
     background-color: var(--pf-c-divider--after--BackgroundColor);
-    justify-self: center;
   }
 
   // stylelint-disable max-nesting-depth
@@ -87,7 +87,7 @@ $pf-c-divider--spacer-map: build-spacer-map("none", "xs", "sm", "md", "lg", "xl"
   @each $breakpoint, $breakpoint-value in $pf-c-divider--breakpoint-map {
     $breakpoint-name: if($breakpoint != "base", -on-#{$breakpoint}, "");
 
-    @if ($breakpoint != "base") {
+    @if $breakpoint != "base" {
       @include pf-apply-breakpoint($breakpoint) {
         &.pf-m-horizontal#{$breakpoint-name} {
           @include pf-c-divider--m-horizontal;

package/components/Drawer/drawer.css

@@ -272,9 +272,9 @@
 }
 
 .pf-c-drawer__actions {
-  grid-column: 2;
-  grid-row: 1;
   display: flex;
+  grid-row: 1;
+  grid-column: 2;
   align-self: baseline;
   margin-top: var(--pf-c-drawer__actions--MarginTop);
   margin-right: var(--pf-c-drawer__actions--MarginRight);

package/components/Drawer/drawer.scss

@@ -335,9 +335,9 @@ $pf-c-drawer__panel--list--width: (25, 33, 50, 66, 75, 100);
 
 // Panel actions
 .pf-c-drawer__actions {
-  grid-column: 2;
-  grid-row: 1;
   display: flex;
+  grid-row: 1;
+  grid-column: 2;
   align-self: baseline;
   margin-top: var(--pf-c-drawer__actions--MarginTop);
   margin-right: var(--pf-c-drawer__actions--MarginRight);

package/components/DualListSelector/dual-list-selector.css

@@ -60,8 +60,8 @@
   --pf-c-dual-list-selector__list-item--m-disabled__item-toggle-icon--Color: var(--pf-global--disabled-color--200);
   display: grid;
   grid-template-areas: "pane-header . pane-header-c" "pane-tools . pane-tools-c" "pane-status . pane-status-c" "pane-menu controls pane-menu-c";
-  grid-template-columns: minmax(var(--pf-c-dual-list-selector--GridTemplateColumns--pane--MinMax--min), var(--pf-c-dual-list-selector--GridTemplateColumns--pane--MinMax--max)) min-content minmax(var(--pf-c-dual-list-selector--GridTemplateColumns--pane--MinMax--min), var(--pf-c-dual-list-selector--GridTemplateColumns--pane--MinMax--max));
   grid-template-rows: repeat(3, auto) auto;
+  grid-template-columns: minmax(var(--pf-c-dual-list-selector--GridTemplateColumns--pane--MinMax--min), var(--pf-c-dual-list-selector--GridTemplateColumns--pane--MinMax--max)) min-content minmax(var(--pf-c-dual-list-selector--GridTemplateColumns--pane--MinMax--min), var(--pf-c-dual-list-selector--GridTemplateColumns--pane--MinMax--max));
 }
 
 .pf-c-dual-list-selector__pane {

package/components/DualListSelector/dual-list-selector.scss

@@ -94,11 +94,11 @@ $pf-c-dual-list-selector__item--MaxNesting: 10;
     "pane-tools . pane-tools-c"
     "pane-status . pane-status-c"
     "pane-menu controls pane-menu-c";
+  grid-template-rows: repeat(3, auto) auto;
   grid-template-columns:
     minmax(var(--pf-c-dual-list-selector--GridTemplateColumns--pane--MinMax--min), var(--pf-c-dual-list-selector--GridTemplateColumns--pane--MinMax--max))
     min-content
     minmax(var(--pf-c-dual-list-selector--GridTemplateColumns--pane--MinMax--min), var(--pf-c-dual-list-selector--GridTemplateColumns--pane--MinMax--max));
-  grid-template-rows: repeat(3, auto) auto;
 }
 
 .pf-c-dual-list-selector__pane {

package/components/EmptyState/empty-state.css

@@ -99,14 +99,14 @@
 .pf-c-empty-state__footer {
   display: flex;
   flex-direction: column;
-  align-items: center;
   row-gap: var(--pf-c-empty-state__footer--RowGap);
+  align-items: center;
   margin-top: var(--pf-c-empty-state__footer--MarginTop);
 }
 
 .pf-c-empty-state__actions {
   display: flex;
   flex-wrap: wrap;
-  justify-content: center;
   gap: var(--pf-c-empty-state__actions--RowGap) var(--pf-c-empty-state__actions--ColumnGap);
+  justify-content: center;
 }

package/components/EmptyState/empty-state.scss

@@ -117,14 +117,14 @@
 .pf-c-empty-state__footer {
   display: flex;
   flex-direction: column;
-  align-items: center;
   row-gap: var(--pf-c-empty-state__footer--RowGap);
+  align-items: center;
   margin-top: var(--pf-c-empty-state__footer--MarginTop);
 }
 
 .pf-c-empty-state__actions {
   display: flex;
   flex-wrap: wrap;
-  justify-content: center;
   gap: var(--pf-c-empty-state__actions--RowGap) var(--pf-c-empty-state__actions--ColumnGap);
+  justify-content: center;
 }

package/components/Form/form.css

@@ -108,8 +108,8 @@
   }
   .pf-c-form.pf-m-horizontal .pf-c-form__group {
     display: grid;
-    grid-column-gap: var(--pf-c-form--m-horizontal__group-label--md--GridColumnGap);
     grid-template-columns: var(--pf-c-form--m-horizontal__group-label--md--GridColumnWidth) var(--pf-c-form--m-horizontal__group-control--md--GridColumnWidth);
+    grid-column-gap: var(--pf-c-form--m-horizontal__group-label--md--GridColumnGap);
   }
   .pf-c-form.pf-m-horizontal .pf-c-form__group-label {
     padding-top: var(--pf-c-form--m-horizontal__group-label--md--PaddingTop);
@@ -128,8 +128,8 @@
   }
   .pf-c-form.pf-m-horizontal-on-xs .pf-c-form__group {
     display: grid;
-    grid-column-gap: var(--pf-c-form--m-horizontal__group-label--md--GridColumnGap);
     grid-template-columns: var(--pf-c-form--m-horizontal__group-label--md--GridColumnWidth) var(--pf-c-form--m-horizontal__group-control--md--GridColumnWidth);
+    grid-column-gap: var(--pf-c-form--m-horizontal__group-label--md--GridColumnGap);
   }
   .pf-c-form.pf-m-horizontal-on-xs .pf-c-form__group-label {
     padding-top: var(--pf-c-form--m-horizontal__group-label--md--PaddingTop);
@@ -148,8 +148,8 @@
   }
   .pf-c-form.pf-m-horizontal-on-sm .pf-c-form__group {
     display: grid;
-    grid-column-gap: var(--pf-c-form--m-horizontal__group-label--md--GridColumnGap);
     grid-template-columns: var(--pf-c-form--m-horizontal__group-label--md--GridColumnWidth) var(--pf-c-form--m-horizontal__group-control--md--GridColumnWidth);
+    grid-column-gap: var(--pf-c-form--m-horizontal__group-label--md--GridColumnGap);
   }
   .pf-c-form.pf-m-horizontal-on-sm .pf-c-form__group-label {
     padding-top: var(--pf-c-form--m-horizontal__group-label--md--PaddingTop);
@@ -168,8 +168,8 @@
   }
   .pf-c-form.pf-m-horizontal-on-md .pf-c-form__group {
     display: grid;
-    grid-column-gap: var(--pf-c-form--m-horizontal__group-label--md--GridColumnGap);
     grid-template-columns: var(--pf-c-form--m-horizontal__group-label--md--GridColumnWidth) var(--pf-c-form--m-horizontal__group-control--md--GridColumnWidth);
+    grid-column-gap: var(--pf-c-form--m-horizontal__group-label--md--GridColumnGap);
   }
   .pf-c-form.pf-m-horizontal-on-md .pf-c-form__group-label {
     padding-top: var(--pf-c-form--m-horizontal__group-label--md--PaddingTop);
@@ -188,8 +188,8 @@
   }
   .pf-c-form.pf-m-horizontal-on-lg .pf-c-form__group {
     display: grid;
-    grid-column-gap: var(--pf-c-form--m-horizontal__group-label--md--GridColumnGap);
     grid-template-columns: var(--pf-c-form--m-horizontal__group-label--md--GridColumnWidth) var(--pf-c-form--m-horizontal__group-control--md--GridColumnWidth);
+    grid-column-gap: var(--pf-c-form--m-horizontal__group-label--md--GridColumnGap);
   }
   .pf-c-form.pf-m-horizontal-on-lg .pf-c-form__group-label {
     padding-top: var(--pf-c-form--m-horizontal__group-label--md--PaddingTop);
@@ -208,8 +208,8 @@
   }
   .pf-c-form.pf-m-horizontal-on-xl .pf-c-form__group {
     display: grid;
-    grid-column-gap: var(--pf-c-form--m-horizontal__group-label--md--GridColumnGap);
     grid-template-columns: var(--pf-c-form--m-horizontal__group-label--md--GridColumnWidth) var(--pf-c-form--m-horizontal__group-control--md--GridColumnWidth);
+    grid-column-gap: var(--pf-c-form--m-horizontal__group-label--md--GridColumnGap);
   }
   .pf-c-form.pf-m-horizontal-on-xl .pf-c-form__group-label {
     padding-top: var(--pf-c-form--m-horizontal__group-label--md--PaddingTop);
@@ -228,8 +228,8 @@
   }
   .pf-c-form.pf-m-horizontal-on-2xl .pf-c-form__group {
     display: grid;
-    grid-column-gap: var(--pf-c-form--m-horizontal__group-label--md--GridColumnGap);
     grid-template-columns: var(--pf-c-form--m-horizontal__group-label--md--GridColumnWidth) var(--pf-c-form--m-horizontal__group-control--md--GridColumnWidth);
+    grid-column-gap: var(--pf-c-form--m-horizontal__group-label--md--GridColumnGap);
   }
   .pf-c-form.pf-m-horizontal-on-2xl .pf-c-form__group-label {
     padding-top: var(--pf-c-form--m-horizontal__group-label--md--PaddingTop);
@@ -344,9 +344,9 @@
   --pf-c-form__group-control--m-inline--child--MarginRight: 0;
 }
 .pf-c-form__group-control.pf-m-stack {
+  --pf-c-form__helper-text--MarginTop: var(--pf-c-grid__group-control--m-stack__helper-text--MarginTop);
   display: grid;
   gap: var(--pf-c-grid__group-control--m-stack--Gap);
-  --pf-c-form__helper-text--MarginTop: var(--pf-c-grid__group-control--m-stack__helper-text--MarginTop);
 }
 .pf-c-form__group-control .pf-c-form__helper-text:first-child {
   --pf-c-form__helper-text--MarginTop: 0;
@@ -430,8 +430,8 @@
 }
 
 .pf-c-form__field-group-toggle {
-  grid-column: 1/2;
   grid-row: 1/2;
+  grid-column: 1/2;
   padding-top: var(--pf-c-form__field-group-toggle--PaddingTop);
   padding-right: var(--pf-c-form__field-group-toggle--PaddingRight);
 }
@@ -453,9 +453,9 @@
 }
 
 .pf-c-form__field-group-header {
-  grid-column: var(--pf-c-form__field-group-header--GridColumn);
-  grid-row: 1/2;
   display: flex;
+  grid-row: 1/2;
+  grid-column: var(--pf-c-form__field-group-header--GridColumn);
   align-items: flex-start;
   padding-top: var(--pf-c-form__field-group-header--PaddingTop);
   padding-bottom: var(--pf-c-form__field-group-header--PaddingBottom);
@@ -488,8 +488,8 @@
 }
 
 .pf-c-form__field-group-body {
-  grid-column: var(--pf-c-form__field-group-body--GridColumn);
   display: grid;
+  grid-column: var(--pf-c-form__field-group-body--GridColumn);
   gap: var(--pf-c-form__field-group-body--Gap);
   padding-top: var(--pf-c-form__field-group-body--PaddingTop);
   padding-bottom: var(--pf-c-form__field-group-body--PaddingBottom);

package/components/Form/form.scss

@@ -192,8 +192,8 @@ $pf-c-form--m-horizontal--breakpoint-map: build-breakpoint-map("sm", "md", "lg",
 
       .pf-c-form__group {
         display: grid;
-        grid-column-gap: var(--pf-c-form--m-horizontal__group-label--md--GridColumnGap);
         grid-template-columns: var(--pf-c-form--m-horizontal__group-label--md--GridColumnWidth) var(--pf-c-form--m-horizontal__group-control--md--GridColumnWidth);
+        grid-column-gap: var(--pf-c-form--m-horizontal__group-label--md--GridColumnGap);
       }
 
       .pf-c-form__group-label {
@@ -333,10 +333,10 @@ $pf-c-form--m-horizontal--breakpoint-map: build-breakpoint-map("sm", "md", "lg",
   }
 
   &.pf-m-stack {
+    --pf-c-form__helper-text--MarginTop: var(--pf-c-grid__group-control--m-stack__helper-text--MarginTop);
+
     display: grid;
     gap: var(--pf-c-grid__group-control--m-stack--Gap);
-
-    --pf-c-form__helper-text--MarginTop: var(--pf-c-grid__group-control--m-stack__helper-text--MarginTop);
   }
 
   .pf-c-form__helper-text:first-child {
@@ -441,8 +441,8 @@ $pf-c-form--m-horizontal--breakpoint-map: build-breakpoint-map("sm", "md", "lg",
 }
 
 .pf-c-form__field-group-toggle {
-  grid-column: 1 / 2;
   grid-row: 1 / 2;
+  grid-column: 1 / 2;
   padding-top: var(--pf-c-form__field-group-toggle--PaddingTop);
   padding-right: var(--pf-c-form__field-group-toggle--PaddingRight);
 
@@ -465,9 +465,9 @@ $pf-c-form--m-horizontal--breakpoint-map: build-breakpoint-map("sm", "md", "lg",
 }
 
 .pf-c-form__field-group-header {
-  grid-column: var(--pf-c-form__field-group-header--GridColumn);
-  grid-row: 1 / 2;
   display: flex;
+  grid-row: 1 / 2;
+  grid-column: var(--pf-c-form__field-group-header--GridColumn);
   align-items: flex-start;
   padding-top: var(--pf-c-form__field-group-header--PaddingTop);
   padding-bottom: var(--pf-c-form__field-group-header--PaddingBottom);
@@ -500,8 +500,8 @@ $pf-c-form--m-horizontal--breakpoint-map: build-breakpoint-map("sm", "md", "lg",
 }
 
 .pf-c-form__field-group-body {
-  grid-column: var(--pf-c-form__field-group-body--GridColumn);
   display: grid;
+  grid-column: var(--pf-c-form__field-group-body--GridColumn);
   gap: var(--pf-c-form__field-group-body--Gap);
   padding-top: var(--pf-c-form__field-group-body--PaddingTop);
   padding-bottom: var(--pf-c-form__field-group-body--PaddingBottom);

package/components/Hint/hint.css

@@ -30,11 +30,11 @@
 
 .pf-c-hint__actions {
   display: inline-grid;
+  grid-row: 1;
+  grid-column: 2;
   grid-auto-flow: column;
   margin-left: var(--pf-c-hint__actions--MarginLeft);
   text-align: right;
-  grid-column: 2;
-  grid-row: 1;
 }
 .pf-c-hint__actions .pf-c-dropdown .pf-c-dropdown__toggle.pf-m-plain {
   margin-top: var(--pf-c-hint__actions--c-dropdown--MarginTop);

package/components/Hint/hint.scss

@@ -41,11 +41,11 @@
 
 .pf-c-hint__actions {
   display: inline-grid;
+  grid-row: 1;
+  grid-column: 2;
   grid-auto-flow: column;
   margin-left: var(--pf-c-hint__actions--MarginLeft);
   text-align: right;
-  grid-column: 2;
-  grid-row: 1;
 
   // Only applies to the plain dropdown
   .pf-c-dropdown .pf-c-dropdown__toggle.pf-m-plain {

package/components/Label/label.css

@@ -287,12 +287,6 @@
 }
 
 .pf-c-label.pf-m-editable {
-  text-decoration: var(--pf-c-label--m-editable--TextDecoration);
-  cursor: var(--pf-c-label--m-editable--Cursor);
-  text-decoration-style: var(--pf-c-label--m-editable--TextDecorationStyle);
-  text-decoration-thickness: var(--pf-c-label--m-editable--TextDecorationThickness);
-  text-underline-offset: var(--pf-c-label--m-editable--TextDecorationOffset);
-  text-decoration-color: var(--pf-c-label--m-editable--TextDecorationColor);
   --pf-c-label__content--MaxWidth: var(--pf-c-label--m-editable__content--MaxWidth);
   --pf-c-label__content--before--BorderWidth: var(--pf-c-label--m-editable__content--before--BorderWidth);
   --pf-c-label__content--before--BorderColor: var(--pf-c-label--m-editable__content--before--BorderColor);
@@ -302,6 +296,12 @@
   --pf-c-label__content--link--focus--before--BorderColor: var(--pf-c-label--m-editable__content--focus--before--BorderColor);
   --pf-c-label--m-outline__content--link--hover--before--BorderWidth: var(--pf-c-label--m-editable__content--before--BorderWidth);
   --pf-c-label--m-outline__content--link--focus--before--BorderWidth: var(--pf-c-label--m-editable__content--before--BorderWidth);
+  text-decoration: var(--pf-c-label--m-editable--TextDecoration);
+  text-decoration-thickness: var(--pf-c-label--m-editable--TextDecorationThickness);
+  text-decoration-style: var(--pf-c-label--m-editable--TextDecorationStyle);
+  text-decoration-color: var(--pf-c-label--m-editable--TextDecorationColor);
+  text-underline-offset: var(--pf-c-label--m-editable--TextDecorationOffset);
+  cursor: var(--pf-c-label--m-editable--Cursor);
 }
 .pf-c-label.pf-m-editable:hover {
   --pf-c-label--m-editable--TextDecorationColor: var(--pf-c-label--m-editable--hover--TextDecorationColor);

package/components/Label/label.scss

@@ -345,13 +345,6 @@
   }
 
   &.pf-m-editable {
-    text-decoration: var(--pf-c-label--m-editable--TextDecoration);
-    cursor: var(--pf-c-label--m-editable--Cursor);
-    text-decoration-style: var(--pf-c-label--m-editable--TextDecorationStyle);
-    text-decoration-thickness: var(--pf-c-label--m-editable--TextDecorationThickness);
-    text-underline-offset: var(--pf-c-label--m-editable--TextDecorationOffset);
-    text-decoration-color: var(--pf-c-label--m-editable--TextDecorationColor);
-
     --pf-c-label__content--MaxWidth: var(--pf-c-label--m-editable__content--MaxWidth);
     --pf-c-label__content--before--BorderWidth: var(--pf-c-label--m-editable__content--before--BorderWidth);
     --pf-c-label__content--before--BorderColor: var(--pf-c-label--m-editable__content--before--BorderColor);
@@ -364,6 +357,13 @@
     --pf-c-label--m-outline__content--link--hover--before--BorderWidth: var(--pf-c-label--m-editable__content--before--BorderWidth);
     --pf-c-label--m-outline__content--link--focus--before--BorderWidth: var(--pf-c-label--m-editable__content--before--BorderWidth);
 
+    text-decoration: var(--pf-c-label--m-editable--TextDecoration);
+    text-decoration-thickness: var(--pf-c-label--m-editable--TextDecorationThickness);
+    text-decoration-style: var(--pf-c-label--m-editable--TextDecorationStyle);
+    text-decoration-color: var(--pf-c-label--m-editable--TextDecorationColor);
+    text-underline-offset: var(--pf-c-label--m-editable--TextDecorationOffset);
+    cursor: var(--pf-c-label--m-editable--Cursor);
+
     &:hover {
       --pf-c-label--m-editable--TextDecorationColor: var(--pf-c-label--m-editable--hover--TextDecorationColor);
     }

package/components/LabelGroup/label-group.css

@@ -34,9 +34,9 @@
   --pf-c-label-group__textarea--PaddingBottom: 0;
   --pf-c-label-group__textarea--PaddingLeft: var(--pf-global--spacer--xs);
   display: inline-flex;
-  align-items: center;
   row-gap: var(--pf-c-label-group--RowGap);
   column-gap: var(--pf-c-label-group--ColumnGap);
+  align-items: center;
 }
 .pf-c-label-group.pf-m-category {
   padding-top: var(--pf-c-label-group--m-category--PaddingTop);
@@ -90,9 +90,9 @@
   display: flex;
   flex: 1;
   flex-wrap: wrap;
-  align-items: baseline;
   row-gap: var(--pf-c-label-group__main--RowGap);
   column-gap: var(--pf-c-label-group__main--ColumnGap);
+  align-items: baseline;
 }
 
 .pf-c-label-group__list {

package/components/LabelGroup/label-group.scss

@@ -48,9 +48,9 @@
   --pf-c-label-group__textarea--PaddingLeft: var(--pf-global--spacer--xs);
 
   display: inline-flex;
-  align-items: center;
   row-gap: var(--pf-c-label-group--RowGap);
   column-gap: var(--pf-c-label-group--ColumnGap);
+  align-items: center;
 
   &.pf-m-category {
     padding-top: var(--pf-c-label-group--m-category--PaddingTop);
@@ -114,9 +114,9 @@
   display: flex;
   flex: 1;
   flex-wrap: wrap;
-  align-items: baseline;
   row-gap: var(--pf-c-label-group__main--RowGap);
   column-gap: var(--pf-c-label-group__main--ColumnGap);
+  align-items: baseline;
 }
 
 .pf-c-label-group__list {

package/components/Login/login.css

@@ -157,10 +157,10 @@
 @media (min-width: 1200px) {
   .pf-c-login__container {
     display: grid;
-    justify-content: center;
-    grid-column-gap: var(--pf-c-login__container--xl--GridColumnGap);
-    grid-template-columns: var(--pf-c-login__container--xl--GridTemplateColumns);
     grid-template-areas: "main header" "main footer" "main .";
+    grid-template-columns: var(--pf-c-login__container--xl--GridTemplateColumns);
+    grid-column-gap: var(--pf-c-login__container--xl--GridColumnGap);
+    justify-content: center;
     padding-right: var(--pf-c-login__container--PaddingRight);
     padding-left: var(--pf-c-login__container--PaddingLeft);
   }
@@ -182,10 +182,10 @@
 }
 
 .pf-c-login__main {
+  grid-area: main;
   align-self: start;
   margin-bottom: var(--pf-c-login__main--MarginBottom);
   background-color: var(--pf-c-login__main--BackgroundColor);
-  grid-area: main;
 }
 .pf-c-login__main > :first-child:not(.pf-c-login__main-header) {
   padding-top: var(--pf-c-login__main-header--PaddingTop);
@@ -197,8 +197,8 @@
 .pf-c-login__main-header {
   display: grid;
   grid-template-columns: 100%;
-  column-gap: var(--pf-c-login__main-header--ColumnGap);
   row-gap: var(--pf-c-login__main-header--RowGap);
+  column-gap: var(--pf-c-login__main-header--ColumnGap);
   align-items: center;
   padding: var(--pf-c-login__main-header--PaddingTop) var(--pf-c-login__main-header--PaddingRight) var(--pf-c-login__main-header--PaddingBottom) var(--pf-c-login__main-header--PaddingLeft);
 }
@@ -210,26 +210,26 @@
 
 .pf-c-login__main-header-utilities,
 .pf-c-login__main-header .pf-c-dropdown {
-  grid-column: auto;
   grid-row: auto;
+  grid-column: auto;
 }
 @media (min-width: 768px) {
   .pf-c-login__main-header-utilities,
   .pf-c-login__main-header .pf-c-dropdown {
-    grid-column: 2/3;
     grid-row: 1;
+    grid-column: 2/3;
   }
 }
 
 .pf-c-login__main-header-utilities .pf-c-dropdown {
-  grid-column: auto;
   grid-row: auto;
+  grid-column: auto;
 }
 
 .pf-c-login__main-header-desc {
+  grid-column: 1/-1;
   margin-bottom: var(--pf-c-login__main-header-desc--MarginBottom);
   font-size: var(--pf-c-login__main-header-desc--FontSize);
-  grid-column: 1/-1;
 }
 
 .pf-c-login__main-body {
@@ -264,11 +264,11 @@
 }
 
 .pf-c-login__main-footer-links-item-link svg {
-  fill: var(--pf-c-login__main-footer-links-item-link-svg--Fill);
   width: 100%;
   max-width: var(--pf-c-login__main-footer-links-item-link-svg--Width);
   height: 100%;
   max-height: var(--pf-c-login__main-footer-links-item-link-svg--Height);
+  fill: var(--pf-c-login__main-footer-links-item-link-svg--Fill);
 }
 .pf-c-login__main-footer-links-item-link:hover svg {
   fill: var(--pf-c-login__main-footer-links-item-link-svg--hover--Fill);

package/components/Login/login.scss

@@ -136,13 +136,13 @@
   // Large viewports
   @media (min-width: $pf-global--breakpoint--xl) {
     display: grid;
-    justify-content: center;
-    grid-column-gap: var(--pf-c-login__container--xl--GridColumnGap);
-    grid-template-columns: var(--pf-c-login__container--xl--GridTemplateColumns);
     grid-template-areas:
       "main header"
       "main footer"
       "main .";
+    grid-template-columns: var(--pf-c-login__container--xl--GridTemplateColumns);
+    grid-column-gap: var(--pf-c-login__container--xl--GridColumnGap);
+    justify-content: center;
     padding-right: var(--pf-c-login__container--PaddingRight);
     padding-left: var(--pf-c-login__container--PaddingLeft);
   }
@@ -165,10 +165,10 @@
 }
 
 .pf-c-login__main {
+  grid-area: main;
   align-self: start;
   margin-bottom: var(--pf-c-login__main--MarginBottom);
   background-color: var(--pf-c-login__main--BackgroundColor);
-  grid-area: main;
 
   // If the first child isn't a header, then we need to put the header's top padding there
   > :first-child:not(.pf-c-login__main-header) {
@@ -184,8 +184,8 @@
 .pf-c-login__main-header {
   display: grid;
   grid-template-columns: 100%;
-  column-gap: var(--pf-c-login__main-header--ColumnGap);
   row-gap: var(--pf-c-login__main-header--RowGap);
+  column-gap: var(--pf-c-login__main-header--ColumnGap);
   align-items: center;
   padding: var(--pf-c-login__main-header--PaddingTop) var(--pf-c-login__main-header--PaddingRight) var(--pf-c-login__main-header--PaddingBottom) var(--pf-c-login__main-header--PaddingLeft);
 
@@ -196,26 +196,26 @@
 
 .pf-c-login__main-header-utilities,
 .pf-c-login__main-header .pf-c-dropdown {
-  grid-column: auto;
   grid-row: auto;
+  grid-column: auto;
 
   @media (min-width: $pf-global--breakpoint--md) {
-    grid-column: 2 / 3;
     grid-row: 1;
+    grid-column: 2 / 3;
   }
 }
 
 .pf-c-login__main-header-utilities {
   .pf-c-dropdown {
-    grid-column: auto;
     grid-row: auto;
+    grid-column: auto;
   }
 }
 
 .pf-c-login__main-header-desc {
+  grid-column: 1 / -1;
   margin-bottom: var(--pf-c-login__main-header-desc--MarginBottom);
   font-size: var(--pf-c-login__main-header-desc--FontSize);
-  grid-column: 1 / -1;
 }
 
 .pf-c-login__main-body {
@@ -253,11 +253,11 @@
 
 .pf-c-login__main-footer-links-item-link {
   svg {
-    fill: var(--pf-c-login__main-footer-links-item-link-svg--Fill);
     width: 100%;
     max-width: var(--pf-c-login__main-footer-links-item-link-svg--Width);
     height: 100%;
     max-height: var(--pf-c-login__main-footer-links-item-link-svg--Height);
+    fill: var(--pf-c-login__main-footer-links-item-link-svg--Fill);
   }
 
   &:hover {

package/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/components/Masthead/masthead.scss

@@ -254,6 +254,7 @@ $pf-c-masthead--inset-map: build-spacer-map("none", "sm", "md", "lg", "xl", "2xl
   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);
@@ -261,7 +262,6 @@ $pf-c-masthead--inset-map: build-spacer-map("none", "sm", "md", "lg", "xl", "2xl
   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);
 
   &::before {
     position: absolute;
@@ -281,6 +281,9 @@ $pf-c-masthead--inset-map: build-spacer-map("none", "sm", "md", "lg", "xl", "2xl
 .pf-c-masthead__content {
   display: flex;
   flex-grow: 1;
+  flex-shrink: 1;
+  grid-column: var(--pf-c-masthead__content--GridColumn);
+  grid-column-end: -1; // force content to right edge or full available width
   align-items: center;
   align-self: stretch;
   order: var(--pf-c-masthead__content--Order);
@@ -288,9 +291,6 @@ $pf-c-masthead--inset-map: build-spacer-map("none", "sm", "md", "lg", "xl", "2xl
   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; // force content to right edge or full available width
-  flex-shrink: 1;
 
   &:only-child {
     --pf-c-masthead__content--MarginLeft: 0;