Skip to content

feat: collapse unchanged lines in split diff view #893

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

Merged

Conversation

shumadrid
Copy link
Contributor

Closes #881

And believe me, the original styling of the indicator was even uglier.

screenshots

@Vinzent03
Copy link
Owner

Vinzent03 commented Apr 1, 2025

What do you think of this design?
image

/* Override styling of Codemirror merge view "collapsed lines" indicator */
.git-split-diff-view .ͼ2 .cm-collapsedLines {
    background: var(--interactive-normal);
    border-radius: var(--radius-m);
    color: var(--text-accent);
    font-size: var(--font-small);
    padding: var(--size-4-1) var(--size-4-1);
}
.git-split-diff-view .ͼ2 .cm-collapsedLines:hover {
    background: var(--interactive-hover);
    color: var(--text-accent-hover);
}

It uses more standard css variables.

@shumadrid
Copy link
Contributor Author

Yeah, that looks better.

@Vinzent03 Vinzent03 merged commit 6377157 into Vinzent03:master Apr 1, 2025
5 checks passed
@shumadrid shumadrid deleted the split-diff-view-collapse-unchanged branch April 1, 2025 14:19
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[Feature Request] Auto scroll to first diff in diff view
2 participants