chore(v6): rebase against main (patternfly#6048)

* chore(select): fixed text in HTML example to show multiple checks can be selected (patternfly#5663)

* chore: Update release.yml to node 18 [ci skip]

* chore: add superclean npm script (patternfly#5798)

* chore(options-menu): updated markup to match react component (patternfly#5809)

* chore(deps): update dependency @patternfly/documentation-framework to v5.1.3 (patternfly#5720)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* chore(deps): bump semver from 5.7.1 to 5.7.2 (patternfly#5756)

Bumps [semver](https://github.com/npm/node-semver) from 5.7.1 to 5.7.2.
- [Release notes](https://github.com/npm/node-semver/releases)
- [Changelog](https://github.com/npm/node-semver/blob/v5.7.2/CHANGELOG.md)
- [Commits](npm/node-semver@v5.7.1...v5.7.2)

---
updated-dependencies:
- dependency-name: semver
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* fix: updated use of flex start/end to be more compatible (patternfly#5807)

* fix(chip): add margin for badge when used in text element (patternfly#5844)

* feat(global): added RTL support (patternfly#5778)

* fix: added tree view icon (patternfly#5845)

* fix: added tree view icon

* chore: put treeviewicon in alphabetical order

* chore: rtl fixes, screenshots (patternfly#5854)

* chore: rtl fixes, screenshots

* chore: checkin screenshots

* chore(deps): update dependency @patternfly/documentation-framework to v5.1.7 (patternfly#5852)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* chore: enable RTL switcher on full page examples (patternfly#5859)

* docs: update location of and references to docs to consolidate and organize information. (patternfly#5773)

* fix: added base, wizard, pagination RTL styles (patternfly#5860)

* chore(Accordion,ExpandableSection): added more RTL styling (patternfly#5861)

* fix(RTL): refactor mixins, add slider rtl styles (patternfly#5867)

* fix(nav): added optional text wrapper for nav text (patternfly#5868)

* chore(deps): update dependency @patternfly/documentation-framework to v5.1.9 (patternfly#5863)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* chore(Toolbar): updated toolbar pagination structure (patternfly#5862)

* fix(breadcrumb): added rtl support (patternfly#5870)

* chore(card): updated horiz demo image (patternfly#5875)

* chore(Alert,NotificationDrawer): added additional rtl styling (patternfly#5866)

* chore(deps): update dependency @patternfly/documentation-framework to v5.1.10 (patternfly#5880)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* chore(Nav, Menu): apply RTL fixes (patternfly#5873)

* fix(clipboard-copy): added rtl styles (patternfly#5876)

* fix(page): added rtl styles (patternfly#5878)

* fix(calendar-month): rtl support (patternfly#5869)

* chore(Card,Tile): apply RTL fixes (patternfly#5881)

* fix: added tabs and jump links rtl styles (patternfly#5877)

* chore(deps): update dependency @patternfly/documentation-framework to v5.1.11 (patternfly#5885)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* chore(DataList): added additional rtl styling (patternfly#5871)

* chore(DataList): added additional rtl styling

* Add comment to update notif badge in breaking change

* fix(popover, tooltip): added rtl styles (patternfly#5882)

* fix(tree-view): added rtl styles (patternfly#5883)

* chore(Table): added additional RTL styling (patternfly#5887)

* chore(Drawer): transforms and shadows on RTL drawer (patternfly#5888)

* fix(forms): updated rtl styles (patternfly#5889)

* fix(skeleton): added rtl styles (patternfly#5891)

* chore(deps): update dependency @patternfly/documentation-framework to v5.1.12 (patternfly#5894)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* fix(slider): added root decl for var to create react token (patternfly#5895)

* chore(ModalBox): center modal for workspace in RTL (patternfly#5893)

* fix(rtl): fixes truncate rtl (patternfly#5874)

* fix(ModalBox): fix centering on mobile (patternfly#5905)

* chore: added backstop as dev dependency, update config (patternfly#5904)

* chore(popover): center examples (patternfly#5906)

* fix(nav): updated example css (patternfly#5903)

* chore(deps): update dependency @patternfly/documentation-framework to v5.1.14 (patternfly#5909)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* fix: remove workspace RTL classes (patternfly#5912)

* chore: update screenshots (patternfly#5915)

* fix: Update upload-preview.js to use new workspace url

* chore(deps): update dependency @patternfly/documentation-framework to v5.1.15 (patternfly#5916)

* chore(deps): update dependency @patternfly/react-table to v5.0.1 (patternfly#5914)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* chore(deps): update dependency @patternfly/react-code-editor to v5.0.1 (patternfly#5910)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* chore(deps): update dependency @patternfly/react-core to v5.0.1 (patternfly#5913)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* chore: mirror fa-sort icon (patternfly#5920)

* fix: mirror bg image position in rtl (patternfly#5922)

* fix(progress): updated indicator direction (patternfly#5923)

* chore: update readme to reference new workspace url

* chore(deps): update dependency @patternfly/documentation-framework to v5.2.0 (patternfly#5925)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* fix(code-editor): make code box and header LTR (patternfly#5928)

* fix(code-editor): make code box and header LTR

* chore: refactor to use dir instead of css for ltr on code block

* fix(banner): fixed invalid dark theme color declaration (patternfly#5933)

* chore(deps): update dependency @patternfly/documentation-framework to v5.2.2 (patternfly#5934)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* chore(deps): update dependency @patternfly/documentation-framework to v5.2.3 (patternfly#5940)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* chore(clipboard-copy): add code example with rtl support (patternfly#5941)

* fix(card): removed border from clickable/selectable selected (patternfly#5935)

* feat(Button): extended inline styling (patternfly#5696)

* fix(menu): updated drilldown breadcrumb menu icons to work in RTL (patternfly#5924)

* fix(toolbar): fix expand all icon in RTL (patternfly#5937)

* chore(toolbar): mirror expand all icon in rtl

* chore: update

* chore: use icon shouldMirrorRTL param

* fix(popover/tooltip): revert arrow logical prop positioning (patternfly#5952)

* fix(popover/tooltip): revert arrow logical prop positioning

* chore: add missing local css import

* chore(screenshots): updated full page screenshots (patternfly#5960)

* chore(deps): update dependency @patternfly/react-core to v5.1.1 (patternfly#5975)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* chore(deps-dev): bump postcss from 8.4.27 to 8.4.31 (patternfly#5971)

* chore(Toolbar): increase workspace container height (patternfly#5962)

* chore(screenshots): update visual regression screenshots (patternfly#5959)

* chore(deps): update dependency @patternfly/documentation-framework to v5.2.17 (patternfly#5961)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* chore(deps): update dependency @patternfly/react-table to v5.1.1 (patternfly#5977)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* chore(deps): update dependency @patternfly/react-code-editor to v5.1.1 (patternfly#5974)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* fix(check-radio): added aria-describedby to check/radio (patternfly#5969)

* chore(deps): update dependency @patternfly/documentation-framework to v5.2.18 (patternfly#5982)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* chore(brand/card): update examples to display logo in dark theme (patternfly#5681)

* fix(input): standardized check and radio alignment (patternfly#5947)

* chore(deps): update dependency @patternfly/documentation-framework to v5.2.19 (patternfly#5985)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* chore(deps): update dependency @patternfly/documentation-framework to v5.2.20 (patternfly#5994)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* chore(deps): bump @babel/traverse from 7.22.15 to 7.23.2 (patternfly#6001)

Bumps [@babel/traverse](https://github.com/babel/babel/tree/HEAD/packages/babel-traverse) from 7.22.15 to 7.23.2.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/commits/v7.23.2/packages/babel-traverse)

---
updated-dependencies:
- dependency-name: "@babel/traverse"
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* fix(Switch): updated focus style to focus-visible (patternfly#5995)

* chore(menu-toggle): updated demos to use menu-toggle (patternfly#5782)

* chore(deps): update dependency @patternfly/documentation-framework to v5.2.24 (patternfly#6014)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* feat(Accordion): added left-aligned toggle variant (patternfly#5987)

* chore(deps): update dependency @patternfly/documentation-framework to v5.2.26 (patternfly#6020)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* chore: V6 merge main.10.30 (patternfly#6023)

* chore(deps): update dependency @patternfly/documentation-framework to v5.3.0 (patternfly#6027)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* chore(main): reverts to pre-v6 merge (patternfly#6038)

* chore(deps): update dependency @patternfly/documentation-framework to v5.3.1 (patternfly#6040)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* fix(globals): update invalid selector in global css (patternfly#6044)

* feat(breaker): bump this version to 6.0 (patternfly#5800)

BREAKING CHANGE: 6.0.0-alpha.0

* fix: white space change to kick off dry run

* fix: use prerelease tag format with dry run

* fix: turn off dryrun

* feat(tokens): add initial global tokens (patternfly#5843)

* feat(Button): adds tokens and applies to buttons (patternfly#5908)

* feat(table): apply tokens from hackathon (patternfly#5965)

* feat(menu-toggle): add in work from hackathon (patternfly#5931)

* feat(nav): adds tokens to page and nav (patternfly#5942)

* chore(tokens): update tokens from figma (patternfly#5970)

* feat(page): page and masthead updates from hackathon (patternfly#5968)

* chore(v6): merge main into v6 (patternfly#5981)

* fix(tokens): add dark theme blend mode token (patternfly#5992)

* feat(notificationBadge): refactor with tokens (patternfly#5991)

* chore(masthead ): applied tokens (patternfly#6004)

* feat(alert): apply tokens (patternfly#6002)

* feat(alert): apply tokens

* feat(alert): remove unused background color

* feat(page): apply tokens (patternfly#6021)

* feat(page): apply tokens

* feat(page): undo menu__list change

* feat(page): tweak spacing

* fix(table): fix clickable overlay (patternfly#6025)

* fix(box-shadow): typo in box shadow token names (patternfly#6039)

* fix(badge): adds tokens, dropdown toggle icon (patternfly#6037)

* feat(hint): apply tokens (patternfly#6030)

* feat(hint): apply tokens

* feat(hint): fix typo

* feat(hint): update spacing

* feat(hint): update border radius

* feat(hint): fix heading font

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: Ashley Ray <123661468+ashley-o0o@users.noreply.github.com>
Co-authored-by: Nicole Thoen <nthoen@redhat.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Erin Donehoo <105813956+edonehoo@users.noreply.github.com>
Co-authored-by: Eric Olkowski <70952936+thatblindgeye@users.noreply.github.com>
Co-authored-by: Sarah Rambacher <srambach@redhat.com>
Co-authored-by: Matt Nolting <matthew.nolting@gmail.com>
Co-authored-by: Jenny <32821331+jenny-s51@users.noreply.github.com>

package.json

@@ -45,7 +45,7 @@
     "@commitlint/config-conventional": "^17.6.7",
     "@fortawesome/fontawesome": "^1.1.8",
     "@octokit/rest": "^20.0.1",
-    "@patternfly/documentation-framework": "5.2.17",
+    "@patternfly/documentation-framework": "5.3.1",
     "@patternfly/patternfly-a11y": "4.3.1",
     "@patternfly/react-code-editor": "5.1.1",
     "@patternfly/react-core": "5.1.1",

src/patternfly/base/_globals.scss

@@ -34,7 +34,7 @@
 @if $pf-v5-global--enable-normalize {
   *,
   *::before,
-  *::after  {
+  *::after {
     box-sizing: border-box;
   }
 

src/patternfly/components/Accordion/accordion.scss

@@ -19,6 +19,12 @@
   --#{$accordion}__toggle--after--Width: var(--#{$pf-global}--BorderWidth--lg);
   --#{$accordion}__toggle--m-expanded--after--BackgroundColor: var(--#{$pf-global}--primary-color--100);
   --#{$accordion}__toggle--BackgroundColor: transparent;
+  --#{$accordion}__toggle--JustifyContent: space-between;
+  --#{$accordion}__toggle--ColumnGap: 0;
+
+  // Accordion toggle toggle-start modifier
+  --#{$accordion}--m-toggle-start__toggle--JustifyContent: start;
+  --#{$accordion}--m-toggle-start__toggle--ColumnGap: var(--#{$pf-global}--spacer--md);
 
   // accordion toggle text
   --#{$accordion}__toggle-text--MaxWidth: calc(100% - var(--#{$pf-global}--spacer--lg));
@@ -85,6 +91,11 @@
 
   background-color: var(--#{$accordion}--BackgroundColor);
 
+  &.pf-m-toggle-start {
+    --#{$accordion}__toggle--JustifyContent: var(--#{$accordion}--m-toggle-start__toggle--JustifyContent);
+    --#{$accordion}__toggle--ColumnGap: var(--#{$accordion}--m-toggle-start__toggle--ColumnGap);
+  }
+
   &.pf-m-display-lg {
     --#{$accordion}__toggle--PaddingTop: var(--#{$accordion}--m-display-lg__toggle--PaddingTop);
     --#{$accordion}__toggle--PaddingRight: var(--#{$accordion}--m-display-lg__toggle--PaddingRight);
@@ -161,8 +172,9 @@
 .#{$accordion}__toggle {
   position: relative;
   display: flex;
+  column-gap: var(--#{$accordion}__toggle--ColumnGap);
   align-items: center;
-  justify-content: space-between;
+  justify-content: var(--#{$accordion}__toggle--JustifyContent);
   width: 100%;
   padding-block-start: var(--#{$accordion}__toggle--PaddingTop);
   padding-block-end: var(--#{$accordion}__toggle--PaddingBottom);

src/patternfly/components/Button/button.scss

@@ -574,14 +574,12 @@
     color: var(--#{$button}--m-plain--Color);
     background-color: var(--#{$button}--m-plain--BackgroundColor);
 
-
     &.pf-m-no-padding {
       padding: 0;
     }
 
     &:hover,
-    &:focus,
-    &:active {
+    &:focus {
       --#{$button}--m-plain--BackgroundColor: var(--#{$button}--m-plain--hover--BackgroundColor);
 
       mix-blend-mode: var(--pf-t--global--background--color--action--plain--hover--blend);

src/patternfly/components/Check/check.scss

@@ -7,7 +7,8 @@
   --#{$check}__label--FontWeight: var(--#{$pf-global}--FontWeight--normal);
   --#{$check}__label--FontSize: var(--#{$pf-global}--FontSize--md);
   --#{$check}__label--LineHeight: var(--#{$pf-global}--LineHeight--md);
-  --#{$check}__input--TranslateY--moz: 5px;
+  --#{$check}__input--TranslateY: calc((var(--pf-v5-c-check__label--LineHeight) * var(--pf-v5-c-check__label--FontSize) / 2 ) - 50%); // find height of single label, divide by two, offset by 50% of own height
+  --#{$check}__input--TranslateY--moz: var(--#{$check}__input--TranslateY); // remove at breaking change
   --#{$check}__description--FontSize: var(--#{$pf-global}--FontSize--sm);
   --#{$check}__description--Color: var(--#{$pf-global}--Color--200);
   --#{$check}__body--MarginTop: var(--#{$pf-global}--spacer--sm);
@@ -20,17 +21,28 @@
   display: grid;
   grid-template-columns: auto 1fr;
   grid-gap: var(--#{$check}--GridGap);
+  align-items: baseline;
 
   &.pf-m-standalone {
     --#{$check}--GridGap: 0;
-    --#{$check}__input--TranslateY--moz: 0;
+    --#{$check}__input--TranslateY: none;
 
     display: inline-grid;
   }
 }
 
+.#{$check}__input {
+  align-self: start;
+
+  // stylelint-disable property-no-vendor-prefix
+  -moz-transform: translateY(var(--#{$check}__input--TranslateY--moz)); // remove at breaking change - no longer needed
+  // stylelint-enable
+
+  // find height of single label, divide by two, offset by 50% of own height
+  transform: translateY(var(--#{$check}__input--TranslateY));
+}
+
 .#{$check}__label {
-  align-self: baseline;
   font-size: var(--#{$check}__label--FontSize);
   font-weight: var(--#{$check}__label--FontWeight);
   line-height: var(--#{$check}__label--LineHeight);
@@ -48,13 +60,6 @@
   margin-block-start: var(--#{$check}__body--MarginTop);
 }
 
-// stylelint-disable property-no-vendor-prefix
-.#{$check}__input {
-  align-self: baseline;
-  -moz-transform: translateY(var(--#{$check}__input--TranslateY--moz));
-}
-// stylelint-enable
-
 .#{$check}__label,
 .#{$check}__input {
   justify-self: start;

src/patternfly/components/Menu/menu.scss

@@ -286,7 +286,7 @@
           $prop: transform,
           $ltr-val: translateX(-100%),
           $rtl-val: translateX(#{pf-v5-calc-inverse(-100%)})
-        );    
+        );
       }
       // stylelint-enable
     }
@@ -569,7 +569,7 @@
     --#{$menu}__item--Color: var(--#{$menu}__list-item--m-disabled__item--Color);
     --#{$menu}__item-toggle-icon: var(--#{$menu}__list-item--m-disabled__item-toggle-icon--Color);
   }
-  
+
   &.pf-m-disabled {
     --#{$menu}__list-item--focus-within--BackgroundColor: transparent;
 
@@ -690,12 +690,16 @@
   display: flex;
   align-items: center;
   margin-inline-end: var(--#{$menu}__item-check--MarginRight);
+
+  .#{$check} {
+    --pf-v5-c-check__input--TranslateY: none;
+  }
 }
 
 // Toggle icon
 .#{$menu}__item-toggle-icon {
   @include pf-v5-mirror-inline-on-rtl;
-  
+
   padding-inline-start: var(--#{$menu}__item-toggle-icon--PaddingLeft);
   padding-inline-end: var(--#{$menu}__item-toggle-icon--PaddingRight);
   color: var(--#{$menu}__item-toggle-icon, inherit);

src/patternfly/components/MenuToggle/menu-toggle--check.hbs

@@ -1 +1,16 @@
-{{> check check--id=(concat menu-toggle--id '-check') check--IsLabelWrapped=true}}
+{{#> id-wrapper menu-toggle--check--id=menu-toggle--id check-input--IsChecked=(ternary check--IsChecked true check-input--IsChecked)}}
+  {{#if menu-toggle--check--IsStandalone}}
+    {{#> check check--type="label" check--modifier="pf-m-standalone" check--IsDisabled=menu-toggle--IsDisabled}}
+      {{> check-input check-input--attribute=(concat 'id="' menu-toggle--check--id '-input" name="' menu-toggle--check--id '-input" aria-label="Standalone input"')}}
+    {{/check}}
+  {{else}}
+    {{#> check check--type="label" check--attribute=(concat 'for="' menu-toggle--check--id '-input"') check--IsDisabled=menu-toggle--IsDisabled}}
+      {{> check-input check-input--attribute=(concat 'id="' menu-toggle--check--id '-input" name="' menu-toggle--check--id '-input"')}}
+      {{#if menu-toggle--check--text}}
+        {{#> check-label check-label--IsDisabled=menu-toggle--IsDisabled check-label--type="span"}}{{menu-toggle--check--text}}{{/check-label}}
+      {{else}}
+        {{#> check-label check-label--IsDisabled=menu-toggle--IsDisabled check-label--type="span"}}Label{{/check-label}}
+      {{/if}}
+    {{/check}}
+  {{/if}}
+{{/id-wrapper}}

src/patternfly/components/MenuToggle/menu-toggle.scss

@@ -360,11 +360,7 @@
       align-self: stretch;
 
       .#{$check}__input {
-        align-self: revert;
-
-        // stylelint-disable property-no-vendor-prefix
-        -moz-transform: none;
-        // stylelint-enable
+        align-self: center;
       }
     }
 
@@ -537,7 +533,7 @@
 
 .#{$menu-toggle}__toggle-icon {
   margin-inline-end: var(--#{$menu-toggle}__toggle-icon--MarginRight);
-  color: var(--#{$menu-toggle}__toggle-icon--Color);
+  color: var(--#{$menu-toggle}__toggle-icon--Color, inherit);
 }
 
 // stylelint-disable no-invalid-position-at-import-rule

src/patternfly/components/Table/table.scss

@@ -106,7 +106,8 @@
   --#{$table}--m-compact__toggle--PaddingBottom: 0;
 
   // Check
-  --#{$table}__check--input--MarginTop: #{pf-size-prem(4px)};
+  --#{$table}__check--input--MarginTop: #{pf-size-prem(3px)};
+  --#{$table}__thead__check--input--TranslateY: var(--#{$table}__check--input--MarginTop);
   --#{$table}__check--input--FontSize: var(--pf-t--global--font--size--body);
 
   // Favorite
@@ -989,13 +990,17 @@
   }
 
   label {
-    display: block;
+    display: inline-flex;
     padding: inherit;
     margin-block-start: calc(var(--#{$table}--cell--PaddingTop) * -1);
     margin-block-end: calc(var(--#{$table}--cell--PaddingBottom) * -1);
     margin-inline-start: calc(var(--#{$table}--cell--PaddingLeft) * -1);
     margin-inline-end: calc(var(--#{$table}--cell--PaddingRight) * -1);
   }
+
+  @at-root .#{$table}__thead .#{$check}.pf-m-standalone {
+    --#{$check}__input--TranslateY: var(--#{$table}__thead__check--input--TranslateY);
+  }
 }
 
 // Favorite body cell

src/patternfly/components/Toolbar/toolbar.scss

@@ -116,11 +116,16 @@ $pf-v5-c-toolbar--inset-map: build-spacer-map("none", "sm", "md", "lg", "xl", "2
 
   // Label
   --#{$toolbar}__item--m-label--spacer: var(--#{$toolbar}__item--spacer);
-  --#{$toolbar}__item--m-label--TranslateY: var(--pf-v5-global--spacer--form-element);
+  --#{$toolbar}__item--m-label--TranslateY: var(--#{$pf-global}--spacer--form-element);
   --#{$toolbar}__item--m-label--FontWeight: var(--#{$pf-global}--FontWeight--bold);
 
+  // Form control inline
+  --#{$toolbar}__item--m-form-element--spacer: var(--#{$toolbar}__item--spacer);
+  --#{$toolbar}__item--m-form-element--TranslateY: var(--#{$pf-global}--spacer--form-element);
+  --#{$toolbar}__item--m-form-element--FontWeight: var(--#{$pf-global}--FontWeight--bold);
+
   // Input
-  --#{$toolbar}__item--m-form-control--TranslateY: var(--pf-v5-global--spacer--form-element);
+  --#{$toolbar}__item--m-form-control--TranslateY: var(--#{$pf-global}--spacer--form-element);
 
   // Label in expanded content
   --#{$toolbar}__expandable-content__item--m-label--MarginBottom: calc(-1 * var(--#{$toolbar}__expandable-content--m-expanded--GridRowGap) + var(--#{$pf-global}--spacer--sm));
@@ -378,7 +383,15 @@ $pf-v5-c-toolbar--inset-map: build-spacer-map("none", "sm", "md", "lg", "xl", "2
     --#{$toolbar}--spacer: var(--#{$toolbar}__item--m-label--spacer);
 
     font-weight: var(--#{$toolbar}__item--m-label--FontWeight);
-    transform: translateY(var(--#{$pf-global}--spacer--form-element));
+    transform: translateY(var(--#{$toolbar}__item--m-label--TranslateY));
+  }
+
+  // Form element
+  &.pf-m-form-element {
+    --#{$toolbar}--spacer: var(--#{$toolbar}__item--m-form-element--spacer);
+
+    font-weight: var(--#{$toolbar}__item--m-form-element--FontWeight);
+    transform: translateY(var(--#{$toolbar}__item--m-form-element--TranslateY));
   }
 
   // Total items