Thanks to visit codestin.com
Credit goes to github.com

Skip to content

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

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
mcoker merged 1 commit into from
Nov 8, 2023
Merged

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

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: 6 additions & 0 deletions src/patternfly/components/Badge/badge-icon.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
<span class="{{pfv}}badge__toggle-icon{{#if badge-icon--modifier}} {{badge-icon--modifier}}{{/if}}"
{{#if badge-icon--attribute}}
{{{badge-icon--attribute}}}
{{/if}}>
<i class="fas fa-caret-down"></i>
</span>
10 changes: 9 additions & 1 deletion src/patternfly/components/Badge/badge.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
<span class="{{pfv}}badge{{#if badge--modifier}} {{badge--modifier}}{{/if}}"
<span class="{{pfv}}badge
{{#if badge--IsUnread}}pf-m-unread {{/if}}
{{#if badge--modifier}} {{badge--modifier}}{{/if}}"
{{#if badge--attribute}}
{{{badge--attribute}}}
{{/if}}>
Expand All @@ -7,4 +9,10 @@
{{else if @partial-block}}
{{> @partial-block}}
{{/if}}
{{#if badge--IsUnread}}
{{#> screen-reader}}unread messages{{/screen-reader}}
{{/if}}
{{#if badge--HasToggle}}
{{> badge-icon}}
{{/if}}
</span>
42 changes: 25 additions & 17 deletions src/patternfly/components/Badge/badge.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,21 +1,29 @@
// @debug $badge; // check your variable names located in src/patternfly/sass-utilities/component-namespaces.scss

.#{$badge} {
:root {
// Component
--#{$badge}--BorderRadius: var(--#{$pf-global}--BorderRadius--lg);
--#{$badge}--FontSize: var(--#{$pf-global}--FontSize--xs);
--#{$badge}--FontWeight: var(--#{$pf-global}--FontWeight--bold);
--#{$badge}--PaddingRight: var(--#{$pf-global}--spacer--sm);
--#{$badge}--PaddingLeft: var(--#{$pf-global}--spacer--sm);
--#{$badge}--Color: var(--#{$pf-global}--Color--dark-100);
--#{$badge}--MinWidth: var(--#{$pf-global}--spacer--xl);
--#{$badge}--BorderRadius: var(--pf-t--global--border--radius--pill);
--#{$badge}--FontSize: var(--pf-t--global--font--size--body--sm);
--#{$badge}--FontWeight: var(--pf-t--global--font--weight--body--bold); // TODO - design calls for 500/semi-bold, do we need a token for that or is bold ok
--#{$badge}--PaddingRight: var(--pf-t--global--spacer--sm);
--#{$badge}--PaddingLeft: var(--pf-t--global--spacer--sm);
--#{$badge}--Color: var(--pf-t--global--text--color--nonstatus--on-gray--default);
--#{$badge}--MinWidth: var(--pf-t--global--spacer--xl);

// Toggle icon
--#{$badge}__toggle-icon--MarginLeft: var(--pf-t--global--spacer--xs);
--#{$badge}__toggle-icon--Color: var(--pf-t--global--icon--color--nonstatus--on-gray--default);

// Modifiers
--#{$badge}--m-read--BackgroundColor: var(--#{$pf-global}--BackgroundColor--200);
--#{$badge}--m-read--Color: var(--#{$pf-global}--Color--dark-100);
--#{$badge}--m-unread--BackgroundColor: var(--#{$pf-global}--primary-color--100);
--#{$badge}--m-unread--Color: var(--#{$pf-global}--Color--light-100);
--#{$badge}--m-read--BackgroundColor: var(--pf-t--global--color--nonstatus--gray--default);
--#{$badge}--m-read--Color: var(--pf-t--global--text--color--nonstatus--on-gray--default);
--#{$badge}--m-read__toggle-icon--Color: var(--pf-t--global--icon--color--nonstatus--on-gray--default);
--#{$badge}--m-unread--BackgroundColor: var(--pf-t--global--color--brand--default);
--#{$badge}--m-unread--Color: var(--pf-t--global--text--color--on-brand--default);
--#{$badge}--m-unread__toggle-icon--Color: var(--pf-t--global--icon--color--on-brand--default);
}

.#{$badge} {
display: inline-block;
min-width: var(--#{$badge}--MinWidth);
padding-inline-start: var(--#{$badge}--PaddingLeft);
Expand All @@ -31,17 +39,17 @@
&.pf-m-read {
--#{$badge}--Color: var(--#{$badge}--m-read--Color);
--#{$badge}--BackgroundColor: var(--#{$badge}--m-read--BackgroundColor);
--#{$badge}__toggle-icon--Color: var(--#{$badge}--m-read__toggle-icon--Color);
}

&.pf-m-unread {
--#{$badge}--Color: var(--#{$badge}--m-unread--Color);
--#{$badge}--BackgroundColor: var(--#{$badge}--m-unread--BackgroundColor);
--#{$badge}__toggle-icon--Color: var(--#{$badge}--m-unread__toggle-icon--Color);
}
}

// stylelint-disable no-invalid-position-at-import-rule
@import "themes/dark/badge";

@include pf-v5-theme-dark {
@include pf-v5-theme-dark-badge;
.#{$badge}__toggle-icon {
margin-inline-start: var(--#{$badge}__toggle-icon--MarginLeft);
color: var(--#{$badge}__toggle-icon--Color);
}
7 changes: 7 additions & 0 deletions src/patternfly/components/Badge/examples/Badge.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,12 @@ cssPrefix: pf-v5-c-badge
{{/badge}}
```

### Badge as toggle
```hbs
{{> badge badge--text="7" badge--modifier="pf-m-read" badge--HasToggle=true}}
{{> badge badge--text="7" badge--IsUnread=true badge--HasToggle=true}}
```

## Documentation
### Overview
Always add a modifier class. Never use the class `.pf-v5-c-badge` on its own.
Expand All @@ -49,5 +55,6 @@ Always add a modifier class. Never use the class `.pf-v5-c-badge` on its own.
| Class | Applied to | Outcome |
| -- | -- | -- |
| `.pf-v5-c-badge` | `<span>` | Initiates a badge. **Always use with a modifier class.** |
| `.pf-v5-c-badge__toggle-icon` | `<span>` | Initiates a badge toggle icon. |
| `.pf-m-read` | `.pf-v5-c-badge` | Applies read badge styling. |
| `.pf-m-unread` | `.pf-v5-c-badge` | Applies unread badge styling. |
9 changes: 0 additions & 9 deletions src/patternfly/components/Badge/themes/dark/badge.scss
View file
Open in desktop

This file was deleted.