Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/patternfly/components/Nav/nav.scss
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@
--#{$menu}--PaddingBlockEnd: 0;
--#{$menu}--BackgroundColor: var(--#{$nav}--BackgroundColor);
--#{$menu}--BoxShadow: none;
--#{$menu}__list-item--hover--BackgroundColor: var(--pf-v6-c-nav__link--hover--BackgroundColor);
--#{$menu}__list-item--hover--BackgroundColor: var(--#{$nav}__link--hover--BackgroundColor);

.#{$menu}__list {
row-gap: var(--#{$nav}__subnav--RowGap);
Expand Down
4 changes: 2 additions & 2 deletions src/patternfly/components/Sidebar/sidebar.scss
Original file line number Diff line number Diff line change
Expand Up @@ -252,9 +252,9 @@ $pf-v6-c-sidebar__panel--list--width: ("default", 25, 33, 50, 66, 75, 100);
@each $width-value in $pf-v6-c-sidebar__panel--list--width {
.pf-v6-c-sidebar__panel.pf-m-width-#{$width-value}#{$breakpoint-name} {
@if $width-value == "default" {
--pf-v6-c-sidebar__panel--FlexBasis: var(--pf-v6-c-sidebar__panel--FlexBasis--base);
--#{$sidebar}__panel--FlexBasis: var(--#{$sidebar}__panel--FlexBasis--base);
} @else {
--pf-v6-c-sidebar__panel--FlexBasis: #{percentage(math.div($width-value, 100))};
--#{$sidebar}__panel--FlexBasis: #{percentage(math.div($width-value, 100))};
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/patternfly/components/Table/table.scss
Original file line number Diff line number Diff line change
Expand Up @@ -595,7 +595,7 @@
}

.#{$button} .#{$table}__sort-indicator {
--pf-v6-c-table__sort-indicator--MarginInlineStart: 0;
--#{$table}__sort-indicator--MarginInlineStart: 0;
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@

// Main
--#{$text-input-group}__main--first-child--not--text-input--MarginInlineStart: calc(var(--pf-t--global--spacer--control--horizontal--plain) / 2);
--#{$text-input-group}__main--m-icon__text-input--PaddingInlineStart: calc(var(--pf-t--global--spacer--control--horizontal--default) + var(--pf-v6-c-text-input-group__icon--FontSize) + var(--pf-t--global--spacer--gap--text-to-element--default));
--#{$text-input-group}--status__text-input--PaddingInlineEnd: calc(var(--pf-t--global--spacer--control--horizontal--default) + var(--pf-v6-c-text-input-group__icon--FontSize) + var(--pf-t--global--spacer--gap--text-to-element--default));
--#{$text-input-group}--utilities--status__text-input--PaddingInlineEnd: calc(var(--pf-t--global--spacer--sm) + var(--pf-v6-c-text-input-group__icon--FontSize) + var(--pf-t--global--spacer--gap--text-to-element--default));
--#{$text-input-group}__main--m-icon__text-input--PaddingInlineStart: calc(var(--pf-t--global--spacer--control--horizontal--default) + var(--#{$text-input-group}__icon--FontSize) + var(--pf-t--global--spacer--gap--text-to-element--default));
--#{$text-input-group}--status__text-input--PaddingInlineEnd: calc(var(--pf-t--global--spacer--control--horizontal--default) + var(--#{$text-input-group}__icon--FontSize) + var(--pf-t--global--spacer--gap--text-to-element--default));
--#{$text-input-group}--utilities--status__text-input--PaddingInlineEnd: calc(var(--pf-t--global--spacer--sm) + var(--#{$text-input-group}__icon--FontSize) + var(--pf-t--global--spacer--gap--text-to-element--default));
--#{$text-input-group}__main--RowGap: var(--pf-t--global--spacer--xs);
--#{$text-input-group}__main--ColumnGap: var(--pf-t--global--spacer--xs);

Expand Down
14 changes: 7 additions & 7 deletions src/patternfly/sass-utilities/mixins.scss
Original file line number Diff line number Diff line change
Expand Up @@ -195,34 +195,34 @@

@mixin pf-v6-hidden-visible($val: "block") {
// stylelint-disable-next-line
--pf-v6-hidden-visible--visible--Display: #{$val};
--#{$pf-prefix}hidden-visible--visible--Display: #{$val};

// base value for visible display property is set to 'block' by default and passed in to
// placeholder via `pf-v6-hidden-visible` mixin

// set hidden var values
// stylelint-disable custom-property-pattern
--pf-v6-hidden-visible--hidden--Display: none;
--#{$pf-prefix}hidden-visible--hidden--Display: none;

// set visibile var values
--pf-v6-hidden-visible--Display: var(--pf-v6-hidden-visible--visible--Display);
--#{$pf-prefix}hidden-visible--Display: var(--#{$pf-prefix}hidden-visible--visible--Display);

// set default state to visible
display: var(--pf-v6-hidden-visible--Display);
display: var(--#{$pf-prefix}hidden-visible--Display);

// toggle values based on state
&.pf-m-hidden {
--pf-v6-hidden-visible--Display: var(--pf-v6-hidden-visible--hidden--Display);
--#{$pf-prefix}hidden-visible--Display: var(--#{$pf-prefix}hidden-visible--hidden--Display);
}

@each $size, $bp in $pf-v6-global--breakpoint-name-map {
@media screen and (min-width: $bp) {
&.pf-m-hidden-on-#{$size} {
--pf-v6-hidden-visible--Display: var(--pf-v6-hidden-visible--hidden--Display);
--#{$pf-prefix}hidden-visible--Display: var(--#{$pf-prefix}hidden-visible--hidden--Display);
}

&.pf-m-visible-on-#{$size} {
--pf-v6-hidden-visible--Display: var(--pf-v6-hidden-visible--visible--Display);
--#{$pf-prefix}hidden-visible--Display: var(--#{$pf-prefix}hidden-visible--visible--Display);
}
}
}
Expand Down
16 changes: 8 additions & 8 deletions src/patternfly/utilities/Sizing/sizing.scss
Original file line number Diff line number Diff line change
Expand Up @@ -47,44 +47,44 @@ $pf-v6-u-height-options: (
@include pf-v6-utility-builder($pf-v6-u-height-options, $pf-v6-global--breakpoint-list);

.#{$pf-prefix}u-min-width {
--pf-v6-u-min-width--MinWidth: 0;
--#{$pf-prefix}u-min-width--MinWidth: 0;

@include pf-v6-build-css-variable-stack(
"min-width",
"--pf-v6-u-min-width--MinWidth",
"--#{$pf-prefix}u-min-width--MinWidth",
$pf-v6-u-sizing--min-max--breakpoint-map,
$important: true
);
}

.#{$pf-prefix}u-max-width {
--pf-v6-u-max-width--MaxWidth: auto;
--#{$pf-prefix}u-max-width--MaxWidth: auto;

@include pf-v6-build-css-variable-stack(
"max-width",
"--pf-v6-u-max-width--MaxWidth",
"--#{$pf-prefix}u-max-width--MaxWidth",
$pf-v6-u-sizing--min-max--breakpoint-map,
$important: true
);
}

.#{$pf-prefix}u-min-height {
--pf-v6-u-min-height--MinHeight: 0;
--#{$pf-prefix}u-min-height--MinHeight: 0;

@include pf-v6-build-css-variable-stack(
"min-height",
"--pf-v6-u-min-height--MinHeight",
"--#{$pf-prefix}u-min-height--MinHeight",
$pf-v6-u-sizing--min-max--breakpoint-map,
$important: true
);
}

.#{$pf-prefix}u-max-height {
--pf-v6-u-max-height--MaxHeight: auto;
--#{$pf-prefix}u-max-height--MaxHeight: auto;

@include pf-v6-build-css-variable-stack(
"max-height",
"--pf-v6-u-max-height--MaxHeight",
"--#{$pf-prefix}u-max-height--MaxHeight",
$pf-v6-u-sizing--min-max--breakpoint-map,
$important: true
);
Expand Down
2 changes: 1 addition & 1 deletion src/patternfly/utilities/Text/text.scss
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ $pf-v6-u-font-size-options: (
font-size var(--pf-t--global--font--size--xl)
),
font-size-2xl: (
font-size var(--pf-v6-global--FontSize--2xl)
font-size var(--pf-t--global--font--size--2xl)
),
font-size-3xl: (
font-size var(--pf-t--global--font--size--3xl)
Expand Down