Review main Merged

81803[BUGFIX] Restore diff-item-result-inline styling

Nikita Hovratov CR +2 V +2 Easy +8 −3 updated 11/22/23, 10:30

Commit message

With the recent introduction of formatted FlexForm diff views, the
styling for "diff-item-result-inline" was removed. However, it is still
needed in other areas. For example in the active TypoScript view when
displaying substitution of constant values.

This patch adds the styling for "diff-item-result-inline" back and in
exchange removes this class from the workspaces "view changes" and
"history" views. There it is not needed, and preserving white-space is
even advantageous.

Review

  • Code review CR +2 Done
    • Jasmina Ließmann +2
    • Andreas Kienast +1
  • Verified V +2 Done
    • Jasmina Ließmann +2
    • Andreas Kienast +1
    • core-ci +1 CI

Issues 2

Files 4

Review log 1013

  1. Nikita Hovratov uploaded patch set 1 11/20/23, 15:37

  2. core-ci voted on patch set 1 V +1 11/20/23, 15:43 Core CI is happy: https://git.typo3.org/typo3/CI/cms/-/pipelines/49149

  3. Oli Bartsch voted on patch set 1 V +1 CR +1 11/22/23, 09:06

  4. Jasmina Ließmann voted on patch set 1 V +2 CR +2 11/22/23, 09:50

  5. Jasmina Ließmann uploaded patch set 2 CR +1 V +1 11/22/23, 10:03

  6. core-ci voted on patch set 2 V -1 11/22/23, 10:09 Core CI is not happy: https://git.typo3.org/typo3/CI/cms/-/pipelines/49327

  7. Jasmina Ließmann uploaded patch set 3 V -1 11/22/23, 10:21

  8. Jasmina Ließmann commented on patch set 3 11/22/23, 10:23

    I'm sorry! I wanted to resolve the merge conflict in the backport patch and accidentally worked on the main patch :'(
  9. core-ci voted on patch set 3 V +1 11/22/23, 10:27 Core CI is happy: https://git.typo3.org/typo3/CI/cms/-/pipelines/49331

  10. Andreas Kienast voted on patch set 3 V +1 CR +1 11/22/23, 10:28

  11. Jasmina Ließmann voted on patch set 3 V +2 CR +2 11/22/23, 10:29

  12. Jasmina Ließmann merged patch set 4 11/22/23, 10:29

  13. Nikita Hovratov commented on patch set 3 11/22/23, 10:30

    Reply

    Thanks for resolving the merge conflict!