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

Fix badges appearance #9155

Merged
merged 7 commits into from
Apr 14, 2024
Merged

Fix badges appearance #9155

merged 7 commits into from
Apr 14, 2024

Conversation

janfaracik
Copy link
Contributor

@janfaracik janfaracik commented Apr 10, 2024

Broken by #9115 - See #9115 (comment).

This PR fixes the badge appearance on light/dark modes.

Before
image

image image image image image

After
image

image image image image image

Testing done

  • Badges appear as expected in light/dark mode

Proposed changelog entries

  • Fix badges appearance

Proposed upgrade guidelines

N/A

Submitter checklist

Desired reviewers

@jenkinsci/sig-ux

Before the changes are marked as ready-for-merge:

Maintainer checklist

@daniel-beck daniel-beck added the regression-fix Pull request that fixes a regression in one of the previous Jenkins releases label Apr 11, 2024
Copy link
Member

@timja timja left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, (checked in chrome and safari, looks fine to me)

@timja timja added the web-ui The PR includes WebUI changes which may need special expertise label Apr 11, 2024
@timja timja requested a review from a team April 11, 2024 07:57
@@ -39,7 +39,7 @@ THE SOFTWARE.
</st:attribute>
</st:documentation>
<j:if test="${attrs.badge != null}">
<span class="jenkins-badge alert-${attrs.badge.severity} ${attrs.class?:''}" tooltip="${attrs.badge.tooltip}">
<span class="jenkins-badge jenkins-!-${attrs.badge.severity}-color ${attrs.class?:''}" tooltip="${attrs.badge.tooltip}">
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What's the semantic difference between the two classes here?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The alert modifier class feels misused here as the badge isn't an alert (hence I missed this in the alert changes MR). Meanwhile the colour classes are relatively widely used in Jenkins already and are generic classes to modify colours of an element, button behaves the same way.

Copy link
Member

@NotMyFault NotMyFault left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/label ready-for-merge


This PR is now ready for merge. We will merge it after ~24 hours if there is no negative feedback.
Please see the merge process documentation for more information about the merge process.
Thanks!

@comment-ops-bot comment-ops-bot bot added the ready-for-merge The PR is ready to go, and it will be merged soon if there is no negative feedback label Apr 12, 2024
@NotMyFault NotMyFault merged commit b59ec5a into jenkinsci:master Apr 14, 2024
17 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
ready-for-merge The PR is ready to go, and it will be merged soon if there is no negative feedback regression-fix Pull request that fixes a regression in one of the previous Jenkins releases web-ui The PR includes WebUI changes which may need special expertise
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants