Skip to content

Correct diff colors & highlighting for none theme

James Chen-Smith requested to merge gitlab-community/gitlab:fix/none-theme-diff-colors into master

What does this MR do and why?

Corrects an issue for the "None" syntax highlighting theme. The issue had to do with CSS specificity for the hll class. This change aligns the section modified in app/assets/stylesheets/highlight/themes/none.scss with app/assets/stylesheets/highlight/white_base.scss, which resolves the issue by lowering the specificity for .new, .new-nomappinginraw & raising the specificity for .hll under .code.none .line_holder .line_content.

Closes #438830

MR acceptance checklist

Please evaluate this MR against the MR acceptance checklist. It helps you analyze changes to reduce risks in quality, performance, reliability, security, and maintainability.

Screenshots or screen recordings

Screenshots are required for UI changes, and strongly recommended for all other merge requests.

Before After
image image
image image

How to set up and validate locally

Numbered steps to set up and validate the change are strongly suggested.

  1. Visit /-/profile/preferences
  2. Under Syntax highlighting theme, select None
  3. Under Diff colors, select any custom color for removed / added lines
  4. Validate colors in preview
  5. Visit any commit (e.g., /flightjs/Flight/-/commit/e0b6082f4d0219f393462b933616eb4b1dbbc6c8)
  6. Click on any line number to highlight
  7. Validate colors

Merge request reports