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.

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

Update badge.js #7510

Merged
merged 1 commit into from
Jul 5, 2024
Merged

Update badge.js #7510

merged 1 commit into from
Jul 5, 2024

Conversation

anezthes
Copy link
Contributor

@anezthes anezthes commented Jul 4, 2024

Description

Buttons with icons placed inside a badge are affected by the following styles:

[theme~='badge'] vaadin-icon {
  margin: -0.25em 0;
}
[theme~='badge'] vaadin-icon:first-child {
  margin-left: -0.375em;
}
[theme~='badge'] vaadin-icon:last-child {
  margin-right: -0.375em;
}

Suggesting these minor changes to avoid any icon misalignment:

[theme~='badge'] > vaadin-icon {
  margin: -0.25em 0;
}
[theme~='badge'] > vaadin-icon:first-child {
  margin-left: -0.375em;
}
[theme~='badge'] > vaadin-icon:last-child {
  margin-right: -0.375em;
}

Type of change

  • Bugfix
  • Feature

Checklist

  • I have read the contribution guide: https://vaadin.com/docs/latest/contributing/overview
  • I have added a description following the guideline.
  • The issue is created in the corresponding repository and I have referenced it.
  • I have added tests to ensure my change is effective and works as intended.
  • New and existing tests are passing locally with my change.
  • [xI have performed self-review and corrected misspellings.

Copy link

sonarqubecloud bot commented Jul 4, 2024

@DiegoCardoso DiegoCardoso merged commit 8eb6583 into main Jul 5, 2024
9 checks passed
@DiegoCardoso DiegoCardoso deleted the badge-icon-fix branch July 5, 2024 07:39
@vaadin-bot
Copy link
Collaborator

Hi @anezthes and @DiegoCardoso, when i performed cherry-pick to this commit to 23.5, i have encountered the following issue. Can you take a look and pick it manually?
Error Message:
Error: Command failed: git cherry-pick 8eb6583
error: could not apply 8eb6583... Update badge.js (#7510)
hint: After resolving the conflicts, mark them with
hint: "git add/rm ", then run
hint: "git cherry-pick --continue".
hint: You can instead skip this commit with "git cherry-pick --skip".
hint: To abort and get back to the state before "git cherry-pick",
hint: run "git cherry-pick --abort".

vaadin-bot pushed a commit that referenced this pull request Jul 5, 2024
sissbruecker pushed a commit that referenced this pull request Jul 5, 2024
Co-authored-by: Jonte Päivärinne <joacim@vaadin.com>
DiegoCardoso added a commit that referenced this pull request Jul 8, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants