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

[JENKINS-70805] Remove !important from styles in <pre> #7836

Merged
merged 4 commits into from
May 1, 2023

Conversation

uhafner
Copy link
Member

@uhafner uhafner commented Apr 12, 2023

Jenkins should allow plugins to change the fonts in themes or plugins that render pre-formatted text. I'm not sure why the important! suffix has been added here but the console view still renders fine when this suffix will be removed.

For more details please see JENKINS-70805.

Console View Before (Left), After (Right) [Both are identical]:

Bildschirmfoto 2023-04-12 um 20 34 02

Source Code View with Prism Plugin Before (Left), After (Right) [Right is fixed, left is broken]:

Bildschirmfoto 2023-04-12 um 20 33 44

Testing done

Manual testing by inspecting the console log view and the source code view of the warnings plugin.

Proposed changelog entries

  • Align source code text and line numbers in views that render source code with the Prism plugin.

Proposed upgrade guidelines

N/A

Submitter checklist

  • The Jira issue, if it exists, is well-described.
  • The changelog entries and upgrade guidelines are appropriate for the audience affected by the change (users or developers, depending on the change) and are in the imperative mood (see examples).
    • Fill in the Proposed upgrade guidelines section only if there are breaking changes or changes that may require extra steps from users during upgrade.
  • There is automated testing or an explanation as to why this change has no tests.
  • New public classes, fields, and methods are annotated with @Restricted or have @since TODO Javadocs, as appropriate.
  • New deprecations are annotated with @Deprecated(since = "TODO") or @Deprecated(forRemoval = true, since = "TODO"), if applicable.
  • New or substantially changed JavaScript is not defined inline and does not call eval to ease future introduction of Content Security Policy (CSP) directives (see documentation).
  • For dependency updates, there are links to external changelogs and, if possible, full differentials.
  • For new APIs and extension points, there is a link to at least one consumer.

Desired reviewers

@timja
@janfaracik

Maintainer checklist

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

  • There are at least two (2) approvals for the pull request and no outstanding requests for change.
  • Conversations in the pull request are over, or it is explicit that a reviewer is not blocking the change.
  • Changelog entries in the pull request title and/or Proposed changelog entries are accurate, human-readable, and in the imperative mood.
  • Proper changelog labels are set so that the changelog can be generated automatically.
  • If the change needs additional upgrade steps from users, the upgrade-guide-needed label is set and there is a Proposed upgrade guidelines section in the pull request title (see example).
  • If it would make sense to backport the change to LTS, a Jira issue must exist, be a Bug or Improvement, and be labeled as lts-candidate to be considered (see query).

Jenkins should allow plugins to change the fonts in themes
or plugins that render preformatted text.
@NotMyFault NotMyFault added the rfe For changelog: Minor enhancement. use `major-rfe` for changes to be highlighted label Apr 12, 2023
@NotMyFault NotMyFault requested a review from a team April 12, 2023 18:58
@daniel-beck
Copy link
Member

Originally added in @janfaracik's #6259 without explanation.

@janfaracik
Copy link
Contributor

Looking good. Only regression that I've found is the CodeMirror textarea on Script Console no longer has the correct font.

Before this change
image

After this change
image

I haven't tried but looks like that could be fixed by applying the properties to .cm-variable in codemirror.less, e.g.

  .cm-variable {
    color: var(--pre-color);
    font-family: var(--font-family-mono);
    font-weight: 500;
    line-height: 1.66;
  }

@NotMyFault NotMyFault added the web-ui The PR includes WebUI changes which may need special expertise label Apr 16, 2023
@github-actions
Copy link
Contributor

Please take a moment and address the merge conflicts of your pull request. Thanks!

@github-actions github-actions bot added the unresolved-merge-conflict There is a merge conflict with the target branch. label Apr 21, 2023
@github-actions github-actions bot removed the unresolved-merge-conflict There is a merge conflict with the target branch. label Apr 21, 2023
@NotMyFault NotMyFault requested a review from janfaracik April 25, 2023 08:00
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.

Thanks!

@NotMyFault NotMyFault requested a review from a team April 29, 2023 09:53
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.

/label ready-for-merge


This PR is now ready for merge, after ~24 hours, we will merge it if there's no negative feedback.

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 29, 2023
@NotMyFault NotMyFault merged commit 7a75b7c into jenkinsci:master May 1, 2023
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 rfe For changelog: Minor enhancement. use `major-rfe` for changes to be highlighted 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.

5 participants