Conversation
…r bar Merge the orange "Changed on disk" warning banner and the separate "On disk vs your unsaved changes" / Close diff toolbar into a single header strip that matches the window chrome. The bar is now diff-aware: View diff toggles to Close diff in place, and the diff overlay no longer renders its own header. Also slim the diff view's right edge — drop the wide diff overview ruler and use thin 8px scrollbars.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
Tidies the "Changed on disk" file-conflict UI in the editor panel so it reads as one minimal header instead of two stacked bars.
On disk vs your unsaved changes/Close difftoolbar are merged into a single strip styled to match the window chrome (same--node-chrome-bgtreatment as the markdown header). Dropped the loud orange tint; the warning icon is the only color accent.Changed on disk…→On disk vs your unsaved changes) andView difftoggles toClose diffin place. The diff overlay no longer renders its own header row.Keep bothuses the app's subtle warning accent instead of a solid orange fill.Test plan
npx tsc --noEmitcleanEditorConflictBanner.test.tsxupdated for the newshowDiff/onCloseDiffprops, plus a new test for the View↔Close diff toggle — all passing