Skip to content
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

fix(styles): define max-width for badges #1892

Merged
merged 15 commits into from
Oct 31, 2023
Merged

fix(styles): define max-width for badges #1892

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
dd5d2c7
fix(styles): define max-width for badges
davidritter-dotcom Aug 30, 2023
f811b40
fix(styles): small fix when the badge is dismissible and has a nested…
davidritter-dotcom Aug 31, 2023
524d843
Revert "fix(styles): small fix when the badge is dismissible and has …
davidritter-dotcom Sep 15, 2023
2e1ce9e
Revert "fix(styles): define max-width for badges"
davidritter-dotcom Sep 15, 2023
da26b99
fix(documentaiton, styles): requested changes
davidritter-dotcom Sep 15, 2023
e616bb7
fix(styles): small change about the collapse when empty
davidritter-dotcom Sep 19, 2023
f7caada
fix(documentation, styles): add changeset
davidritter-dotcom Sep 19, 2023
1b5cd14
Merge branch 'main' into 1159-styles-define-max-width-for-badges
davidritter-dotcom Sep 21, 2023
3433d79
Update packages/documentation/src/stories/components/badge/badge.stor…
davidritter-dotcom Sep 27, 2023
6b627de
Merge branch 'main' into 1159-styles-define-max-width-for-badges
gfellerph Oct 6, 2023
2cbceaf
Update .changeset/polite-panthers-care.md
davidritter-dotcom Oct 10, 2023
e914a8f
Update packages/styles/src/placeholders/badge.scss
davidritter-dotcom Oct 10, 2023
d143f7f
Update .changeset/polite-panthers-care.md
davidritter-dotcom Oct 10, 2023
a517fdc
fix(documentation): change request
davidritter-dotcom Oct 10, 2023
e475679
Merge branch 'main' into 1159-styles-define-max-width-for-badges
davidritter-dotcom Oct 24, 2023
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 packages/documentation/src/stories/components/badge/badge.stories.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ function externalControl(story: any, { args }: StoryContext) {

// RENDERER
function getDefaultContent(args: Args) {
if (!args.nestedBadge) return html`${args.text}`;
if (!args.nestedBadge) return html`<span>${html`${args.text}`}</span>`;
davidritter-dotcom marked this conversation as resolved.
Show resolved Hide resolved

return html`
<span>${html`${args.text}`}</span>
Expand Down
9 changes: 8 additions & 1 deletion packages/styles/src/placeholders/badge.scss
View file
Open in desktop
oliverschuerch marked this conversation as resolved.
Show resolved Hide resolved
davidritter-dotcom marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
%badge {
@include border-radius($badge-border-radius);
display: inline-flex;
justify-content: center;
justify-content: flex-start;
align-items: center;
gap: badge.$badge-gap;
padding: $badge-padding-y $badge-padding-x;
Expand All @@ -17,6 +17,13 @@
text-align: center;
white-space: nowrap;
vertical-align: baseline;
max-width: 100%;

> span {
text-overflow: ellipsis;
overflow: hidden;
white-space: nowrap;
}

// Empty badges collapse automatically
&:empty {
Expand Down