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

Contrast issue with checkbox in merge editor #323

Open
TimonVS opened this issue Aug 29, 2022 · 3 comments
Open

Contrast issue with checkbox in merge editor #323

TimonVS opened this issue Aug 29, 2022 · 3 comments

Comments

@TimonVS
Copy link

TimonVS commented Aug 29, 2022

I'm using the GitHub Dark theme and I was thoroughly confused when the new three-way merge editor showed up in VS Code, I was confused because I didn't see a checkbox next to the conflict to accept a change. A colleague pointed out there was a checkbox when I shared the screenshot with them asking what to do, but they had trouble spotting it too. This issue isn't present in the default dark theme. I also noticed that the other dark variations don't have this issue, it's just GitHub Dark.

CleanShot 2022-08-29 at 15 59 06@2x

By comparison, the default dark theme:

CleanShot 2022-08-29 at 16 01 58@2x

@TimonVS
Copy link
Author

TimonVS commented Aug 29, 2022

I see now that GitHub Dark has been deprecated. So we should probably close this issue? Is it possible to notify people that this theme has been deprecated and probably won't be updated to take new features like the three-way merge editor into account?

@simurai
Copy link
Contributor

simurai commented Jan 3, 2023

Is this also a problem with the checkboxes in the settings? Seems not?

Screen Shot 2023-01-03 at 17 20 08

So maybe the merge editor checkboxes are different?

@simurai
Copy link
Contributor

simurai commented Jan 3, 2023

Tried to reproduce it by creating a merge conflict, but there doesn't seem to be any checkboxes. Even with the GitHub Dark Default theme.

Screen Shot 2023-01-03 at 17 36 27

Maybe they got replaced with text buttons (e.g. "Accept incoming") in the meantime? 🤔

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

No branches or pull requests

2 participants