Skip to content

fix(global): use tokens for links/help-text/editable-text #6908

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.

Sign up for GitHub

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

Merged
srambach merged 1 commit into from
Jul 19, 2024
Merged

fix(global): use tokens for links/help-text/editable-text #6908

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 deletions src/patternfly/base/normalize.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,12 +91,12 @@

:where(a) {
color: var(--pf-t--global--text--color--link--default);
text-decoration: var(--pf-t--global--link--text-decoration);
text-decoration: var(--pf-t--global--text-decoration--link--line--default);
}

:where(a:hover) {
:where(a:hover, a:focus) {
color: var(--pf-t--global--text--color--link--hover);
text-decoration: var(--pf-t--global--link--text-decoration--hover);
text-decoration: var(--pf-t--global--text-decoration--link--line--hover);
}

:where(
Expand Down
2 changes: 1 addition & 1 deletion src/patternfly/base/tokens/tokens-charts-dark.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@

// Do not edit directly
// Generated on Tue, 16 Jul 2024 23:44:44 GMT
// Generated on Thu, 18 Jul 2024 22:27:54 GMT

@mixin pf-v6-tokens {
--pf-t--chart--global--BorderWidth--lg: 8;
Expand Down
2 changes: 1 addition & 1 deletion src/patternfly/base/tokens/tokens-charts.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@

// Do not edit directly
// Generated on Tue, 16 Jul 2024 23:44:44 GMT
// Generated on Thu, 18 Jul 2024 22:27:54 GMT

@mixin pf-v6-tokens {
--pf-t--chart--global--BorderWidth--lg: 8;
Expand Down
2 changes: 1 addition & 1 deletion src/patternfly/base/tokens/tokens-dark.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@

// Do not edit directly
// Generated on Tue, 16 Jul 2024 23:44:44 GMT
// Generated on Thu, 18 Jul 2024 22:27:54 GMT

@mixin pf-v6-tokens {
--pf-t--global--background--color--action--plain--default: rgba(0, 0, 0, 0.0000);
Expand Down
6 changes: 3 additions & 3 deletions src/patternfly/base/tokens/tokens-default.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@

// Do not edit directly
// Generated on Tue, 16 Jul 2024 23:44:44 GMT
// Generated on Thu, 18 Jul 2024 22:27:54 GMT

@mixin pf-v6-tokens {
--pf-t--global--background--color--500: rgba(21, 21, 21, 0.2000);
Expand Down Expand Up @@ -300,8 +300,8 @@
--pf-t--global--text-decoration--help-text--line--hover: var(--pf-t--global--text-decoration--line--200);
--pf-t--global--text-decoration--help-text--style--default: var(--pf-t--global--text-decoration--style--200);
--pf-t--global--text-decoration--help-text--style--hover: var(--pf-t--global--text-decoration--style--200);
--pf-t--global--text-decoration--link--line--default: var(--pf-t--global--text-decoration--style--200);
--pf-t--global--text-decoration--link--line--hover: var(--pf-t--global--text-decoration--style--200);
--pf-t--global--text-decoration--link--line--default: var(--pf-t--global--text-decoration--line--200);
--pf-t--global--text-decoration--link--line--hover: var(--pf-t--global--text-decoration--line--200);
--pf-t--global--text-decoration--link--style--default: var(--pf-t--global--text-decoration--style--100);
--pf-t--global--text-decoration--link--style--hover: var(--pf-t--global--text-decoration--style--100);
--pf-t--global--z-index--2xl: var(--pf-t--global--z-index--600);
Expand Down
6 changes: 0 additions & 6 deletions src/patternfly/base/tokens/tokens-local.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,6 @@
--pf-t--global--font--weight--heading--bold--legacy: 700;

// Other missing ones
// text-decoration
--pf-t--global--text-decoration--100: none;
--pf-t--global--text-decoration--200: underline;
--pf-t--global--link--text-decoration: var(--pf-t--global--text-decoration--100);
--pf-t--global--link--text-decoration--hover: var(--pf-t--global--text-decoration--200);

// sm box-shadow
--pf-t--global--box-shadow--sm:
var(--pf-t--global--box-shadow--X--sm--default)
Expand Down
2 changes: 1 addition & 1 deletion src/patternfly/base/tokens/tokens-palette.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@

// Do not edit directly
// Generated on Tue, 16 Jul 2024 23:44:44 GMT
// Generated on Thu, 18 Jul 2024 22:27:54 GMT

@mixin pf-v6-tokens {
--pf-t--color--black: #000000;
Expand Down
15 changes: 9 additions & 6 deletions src/patternfly/components/Breadcrumb/breadcrumb.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,11 @@
--#{$breadcrumb}__link--PaddingInlineStart: var(--pf-t--global--spacer--sm); // use a mutable value for alignment control
--#{$breadcrumb}__link--PaddingInlineEnd: var(--pf-t--global--spacer--sm); // use a mutable value for alignment control
--#{$breadcrumb}__link--Color: var(--pf-t--global--text--color--link--default);
--#{$breadcrumb}__link--TextDecoration: var(--pf-t--global--link--text-decoration);
--#{$breadcrumb}__link--TextDecorationLine: var(--pf-t--global--text-decoration--link--line--default);
--#{$breadcrumb}__link--TextDecorationStyle: var(--pf-t--global--text-decoration--link--style--default);
--#{$breadcrumb}__link--hover--Color: var(--pf-t--global--text--color--link--hover);
--#{$breadcrumb}__link--hover--TextDecoration: var(--pf-t--global--link--text-decoration--hover);
--#{$breadcrumb}__link--hover--TextDecorationLine: var(--pf-t--global--text-decoration--link--line--hover);
--#{$breadcrumb}__link--hover--TextDecorationStyle: var(--pf-t--global--text-decoration--link--style--hover);
--#{$breadcrumb}__link--m-current--Color: var(--pf-t--global--text--color--regular);
--#{$breadcrumb}__link--BackgroundColor: transparent;

Expand Down Expand Up @@ -79,13 +81,14 @@
font-weight: var(--#{$breadcrumb}__link--FontWeight);
line-height: inherit;
color: var(--#{$breadcrumb}__link--Color);
text-decoration: var(--#{$breadcrumb}__link--TextDecoration);
text-decoration: var(--#{$breadcrumb}__link--TextDecorationLine) var(--#{$breadcrumb}__link--TextDecorationStyle);
word-break: break-word;
background-color: var(--#{$breadcrumb}__link--BackgroundColor);

&:hover {
&:is(:hover, :focus) {
--#{$breadcrumb}__link--Color: var(--#{$breadcrumb}__link--hover--Color);
--#{$breadcrumb}__link--TextDecoration: var(--#{$breadcrumb}__link--hover--TextDecoration);
--#{$breadcrumb}__link--TextDecorationLine: var(--#{$breadcrumb}__link--hover--TextDecorationLine);
--#{$breadcrumb}__link--TextDecorationStyle: var(--#{$breadcrumb}__link--hover--TextDecorationStyle);
}


Expand All @@ -94,7 +97,7 @@
cursor: default;

&,
&:hover {
&:is(:hover, :focus) {
color: var(--#{$breadcrumb}__link--m-current--Color);
text-decoration: none;
}
Expand Down
24 changes: 17 additions & 7 deletions src/patternfly/components/Button/button.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,8 @@
--#{$button}--BorderColor: transparent;
--#{$button}--BorderWidth: var(--pf-t--global--border--width--action--default);
--#{$button}--BorderRadius: var(--pf-t--global--border--radius--pill);
--#{$button}--TextDecoration: none;
--#{$button}--TextDecorationLine: none;
--#{$button}--TextDecorationStyle: none;
--#{$button}--TransitionDuration: var(--pf-t--global--motion--duration--fade--default);
--#{$button}--TransitionTimingFunction: var(--pf-t--global--motion--timing-function--default);
--#{$button}--TransitionProperty: color, background-color, border-width, border-color, padding;
Expand All @@ -26,7 +27,8 @@
--#{$button}--hover--BackgroundColor: transparent;
--#{$button}--hover--BorderColor: transparent;
--#{$button}--hover--BorderWidth: var(--pf-t--global--border--width--action--hover);
--#{$button}--hover--TextDecoration: none;
--#{$button}--hover--TextDecorationLine: none;
--#{$button}--hover--TextDecorationStyle: none;

// Clicked
--#{$button}--m-clicked--BackgroundColor: transparent;
Expand Down Expand Up @@ -110,7 +112,10 @@
--#{$button}--m-link--m-inline--PaddingInlineEnd: 0;
--#{$button}--m-link--m-inline--PaddingBlockEnd: 0;
--#{$button}--m-link--m-inline--PaddingInlineStart: 0;
--#{$button}--m-link--m-inline--hover--TextDecoration: var(--pf-t--global--link--text-decoration--hover);
--#{$button}--m-link--m-inline--TextDecorationLine: var(--pf-t--global--text-decoration--link--line--default);
--#{$button}--m-link--m-inline--TextDecorationStyle: var(--pf-t--global--text-decoration--link--style--default);
--#{$button}--m-link--m-inline--hover--TextDecorationLine: var(--pf-t--global--text-decoration--link--line--hover);
--#{$button}--m-link--m-inline--hover--TextDecorationStyle: var(--pf-t--global--text-decoration--link--style--hover);
--#{$button}--m-link--m-inline__progress--InsetInlineStart: var(--pf-t--global--spacer--xs);
--#{$button}--m-link--m-inline--m-in-progress--PaddingInlineStart: calc(var(--#{$button}--m-link--m-inline__progress--InsetInlineStart) + 1rem + var(--pf-t--global--spacer--sm));
--#{$button}--m-link--m-inline--disabled--Color: var(--pf-t--global--text--color--disabled);
Expand Down Expand Up @@ -297,7 +302,7 @@
line-height: var(--#{$button}--LineHeight, inherit);
color: var(--#{$button}--Color);
text-align: center;
text-decoration: var(--#{$button}--TextDecoration);
text-decoration: var(--#{$button}--TextDecorationLine) var(--#{$button}--TextDecorationStyle);
white-space: nowrap;
cursor: pointer; // needed for when a button does not use <button> - eg, <span>
user-select: none;
Expand Down Expand Up @@ -413,7 +418,10 @@
--#{$button}--PaddingInlineStart: var(--#{$button}--m-link--m-inline--PaddingInlineStart);
--#{$button}--BackgroundColor: transparent;
--#{$button}__progress--InsetInlineStart: var(--#{$button}--m-link--m-inline__progress--InsetInlineStart);
--#{$button}--hover--TextDecoration: var(--#{$button}--m-link--m-inline--hover--TextDecoration);
--#{$button}--TextDecorationLine: var(--#{$button}--m-link--m-inline--TextDecorationLine);
--#{$button}--TextDecorationStyle: var(--#{$button}--m-link--m-inline--TextDecorationStyle);
--#{$button}--hover--TextDecorationLine: var(--#{$button}--m-link--m-inline--hover--TextDecorationLine);
--#{$button}--hover--TextDecorationStyle: var(--#{$button}--m-link--m-inline--hover--TextDecorationStyle);
--#{$button}--hover--BackgroundColor: transparent;
--#{$button}--m-clicked--BackgroundColor: transparent;
--#{$button}--disabled--BackgroundColor: transparent;
Expand Down Expand Up @@ -598,8 +606,9 @@
--#{$button}--BackgroundColor: var(--#{$button}--hover--BackgroundColor);
--#{$button}--BorderColor: var(--#{$button}--hover--BorderColor);
--#{$button}--BorderWidth: var(--#{$button}--hover--BorderWidth);
--#{$button}--TextDecoration: var(--#{$button}--hover--TextDecoration);
--#{$button}__icon--Color: var(--#{$button}--hover__icon--Color);

text-decoration: var(--#{$button}--hover--TextDecorationLine) var(--#{$button}--hover--TextDecorationStyle);
}

&.pf-m-clicked {
Expand Down Expand Up @@ -633,7 +642,8 @@
}

&.pf-m-aria-disabled {
--#{$button}--m-link--m-inline--hover--TextDecoration: none;
--#{$button}--m-link--m-inline--hover--TextDecorationLine: var(--#{$button}--TextDecorationLine);
--#{$button}--m-link--m-inline--hover--TextDecorationStyle: var(--#{$button}--TextDecorationStyle);

cursor: default;
}
Expand Down
13 changes: 8 additions & 5 deletions src/patternfly/components/Content/content.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,9 +63,11 @@

// Links
--#{$content}--a--Color: var(--pf-t--global--text--color--link--default);
--#{$content}--a--TextDecoration: var(--pf-t--global--link--text-decoration);
--#{$content}--a--TextDecorationLine: var(--pf-t--global--text-decoration--link--line--default);
--#{$content}--a--TextDecorationStyle: var(--pf-t--global--text-decoration--link--style--default);
--#{$content}--a--hover--Color: var(--pf-t--global--text--color--link--hover);
--#{$content}--a--hover--TextDecoration: var(--pf-t--global--link--text-decoration);
--#{$content}--a--hover--TextDecorationLine: var(--pf-t--global--text-decoration--link--line--hover);
--#{$content}--a--hover--TextDecorationStyle: var(--pf-t--global--text-decoration--link--style--hover);
--#{$content}--a--visited--Color: var(--pf-t--global--text--color--link--visited);

// Blockquote
Expand Down Expand Up @@ -103,11 +105,12 @@
& a
) {
color: var(--#{$content}--a--Color);
text-decoration: var(--#{$content}--a--TextDecoration);
text-decoration: var(--#{$content}--a--TextDecorationLine) var(--#{$content}--a--TextDecorationStyle);

&:hover {
&:is(:hover, :focus) {
--#{$content}--a--Color: var(--#{$content}--a--hover--Color);
--#{$content}--a--TextDecoration: var(--#{$content}--a--hover--TextDecoration);
--#{$content}--a--TextDecorationLine: var(--#{$content}--a--hover--TextDecorationLine);
--#{$content}--a--TextDecorationStyle: var(--#{$content}--a--hover--TextDecorationStyle);
}
}

Expand Down
4 changes: 2 additions & 2 deletions src/patternfly/components/DescriptionList/description-list-term.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{{#> wrapper description-list-text--type="span"}}{{!-- in a term, always make the text a span --}}
{{#> wrapper description-list-text--type="span" description-list-text--IsHelp=description-list-term--IsHelp}}{{!-- in a term, always make the text a span --}}
<dt class="{{pfv}}description-list__term{{#if description-list-term--modifier}} {{description-list-term--modifier}}{{/if}}"
{{#if description-list-term--attribute}}
{{{description-list-term--attribute}}}
{{/if}}>
{{> @partial-block}}
{{> @partial-block}}
</dt>
{{/wrapper}}
4 changes: 3 additions & 1 deletion src/patternfly/components/DescriptionList/description-list-text.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
<{{#if description-list-text--type}}{{description-list-text--type}}{{else}}div{{/if}} class="{{pfv}}description-list__text{{#if description-list-text--modifier}} {{description-list-text--modifier}}{{/if}}{{#if description-list-text--IsHelp}} pf-m-help-text{{/if}}"
<{{#if description-list-text--type}}{{description-list-text--type}}{{else}}div{{/if}} class="{{pfv}}description-list__text
{{#if description-list-text--modifier}} {{description-list-text--modifier}}{{/if}}
{{#if description-list-text--IsHelp}} pf-m-help-text{{/if}}"
{{#if description-list-text--IsHelp}}
role="button"
type="button"
Expand Down
26 changes: 10 additions & 16 deletions src/patternfly/components/DescriptionList/description-list.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,11 +54,11 @@ $pf-v6-c-description-list--breakpoint-map: build-breakpoint-map("base", "sm", "m
--#{$description-list}--m-auto-fit--GridTemplateColumns--minmax--min: var(--#{$description-list}--m-auto-fit--GridTemplateColumns--min);

// help text
--#{$description-list}__text--m-help-text--TextDecorationColor: currentcolor;
--#{$description-list}__text--m-help-text--TextDecorationThickness: var(--pf-t--global--border--width--regular);
--#{$description-list}__text--m-help-text--TextDecorationOffset: #{pf-size-prem(4px)};
--#{$description-list}__text--m-help-text--hover--TextDecorationColor: var(--pf-t--global--border--color--hover);
--#{$description-list}__text--m-help-text--focus--TextDecorationColor: var(--pf-t--global--border--color--hover);
--#{$description-list}__text--m-help-text--TextDecorationLine: var(--pf-t--global--text-decoration--help-text--line--default);
--#{$description-list}__text--m-help-text--TextDecorationStyle: var(--pf-t--global--text-decoration--help-text--style--default);
--#{$description-list}__text--m-help-text--TextUnderlineOffset: #{pf-size-prem(4px)};
--#{$description-list}__text--m-help-text--hover--TextDecorationLine: var(--pf-t--global--text-decoration--help-text--line--hover);
--#{$description-list}__text--m-help-text--hover--TextDecorationStyle: var(--pf-t--global--text-decoration--help-text--style--hover);

// Display modifiers
--#{$description-list}--m-display-lg__description--FontSize: var(--pf-t--global--font--size--body--lg); // TODO replace with new font tokens when available
Expand Down Expand Up @@ -179,19 +179,13 @@ $pf-v6-c-description-list--breakpoint-map: build-breakpoint-map("base", "sm", "m
min-width: 0; // this allows overflow-wrap to work

&.pf-m-help-text {
text-decoration: underline;
text-decoration-thickness: var(--#{$description-list}__text--m-help-text--TextDecorationThickness);
text-decoration-style: dashed;
text-decoration-color: var(--#{$description-list}__text--m-help-text--TextDecorationColor);
text-underline-offset: var(--#{$description-list}__text--m-help-text--TextDecorationOffset);
text-decoration: var(--#{$description-list}__text--m-help-text--TextDecorationLine) var(--#{$description-list}__text--m-help-text--TextDecorationStyle);
text-underline-offset: var(--#{$description-list}__text--m-help-text--TextUnderlineOffset);
cursor: pointer;

&:hover {
--#{$description-list}__text--m-help-text--TextDecorationColor: var(--#{$description-list}__text--m-help-text--hover--TextDecorationColor);
}

&:focus {
--#{$description-list}__text--m-help-text--TextDecorationColor: var(--#{$description-list}__text--m-help-text--focus--TextDecorationColor);
&:is(:hover, :focus) {
--#{$description-list}__text--m-help-text--TextDecorationLine: var(--#{$description-list}__text--m-help-text--hover--TextDecorationLine);
--#{$description-list}__text--m-help-text--TextDecorationStyle: var(--#{$description-list}__text--m-help-text--hover--TextDecorationStyle);
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/patternfly/components/DescriptionList/examples/DescriptionList.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ cssPrefix: pf-v6-c-description-list

### Term help text
```hbs
{{> description-list__example description-list--title="Term help text" description-list-term--TextIsHelp="true"}}
{{> description-list__example description-list--title="Term help text" description-list-term--IsHelp="true"}}
```

### Default, two column
Expand Down
3 changes: 1 addition & 2 deletions src/patternfly/components/JumpLinks/jump-links.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,8 +162,7 @@ $pf-v6-c-jump-links--m-expandable--breakpoint-map: build-breakpoint-map("base",
text-decoration: none;
outline-offset: var(--#{$jump-links}__link--OutlineOffset);

&:hover,
&:focus {
&:is(:hover, :focus) {
--#{$jump-links}__link-text--Color: var(--#{$jump-links}__link--hover__link-text--Color);
}

Expand Down
Loading