GramEditor/gram
37
980
Fork
You've already forked gram
88

git conflicts use background colors that make text unreadable #355

Open
opened 2026年06月27日 02:57:13 +02:00 by sylfn · 0 comments

I use Ayu Dark theme, and I have noticed that background colors in git conflicts are a bit too bright:

Gram editor window. The Rust code has a stash apply conflict in a diff3 form. Background for "ours" is too green and background for "theirs" is too blue, making the line numbers in the gutter hard to read. Editor theme is Ayu Dark

The weird color choice persists across themes (with the example of Catppuccin Mocha):

Same issue, now in Catppuccin Mocha

The colors are normal if I make sure no conflicts are present in the opened repository, switch theme to Catppuccin Mocha, and introduce conflicts again. (I'm unsure if switching themes is really needed). The colors somehow fix themselves:

Gram editor window. Same code, same conflict, the background is now less bright and there is a bit more contrast. Editor theme is Catppuccin Mocha

Switching back to Ayu Dark does not break colors:

Same, but in Ayu Dark

But restarting Gram does (and the result is the first screenshot, which is how I got these, with a series of restarts and theme-switching)

system information

Gram: v2.1.2 (Gram)
Memory: 60.7 GiB
Architecture: x86_64
GPU: AMD Radeon Graphics (RADV RENOIR) || radv || Mesa 26.1.2

Installed from nixpkgs on NixOS 26.11pre1011622.a799d3e3886d (Zokor)

I use Ayu Dark theme, and I have noticed that background colors in git conflicts are a bit too bright: ![Gram editor window. The Rust code has a stash apply conflict in a diff3 form. Background for "ours" is too green and background for "theirs" is too blue, making the line numbers in the gutter hard to read. Editor theme is Ayu Dark](attachments/8dffdee4-a31a-43ae-9edb-3ee45c2fef9a) The weird color choice persists across themes (with the example of Catppuccin Mocha): ![Same issue, now in Catppuccin Mocha](/attachments/ec947bec-0ba3-4165-acd6-33403664071d) The colors are normal if I make sure no conflicts are present in the opened repository, switch theme to Catppuccin Mocha, and introduce conflicts again. (I'm unsure if switching themes is really needed). The colors somehow fix themselves: ![Gram editor window. Same code, same conflict, the background is now less bright and there is a bit more contrast. Editor theme is Catppuccin Mocha](/attachments/ae0bf812-e719-458a-98b8-5509a837fe83) Switching back to Ayu Dark does not break colors: ![Same, but in Ayu Dark](/attachments/731eda43-662f-49c3-83d9-0535a4dbc198) But restarting Gram does (and the result is the first screenshot, which is how I got these, with a series of restarts and theme-switching) ## system information Gram: v2.1.2 (Gram) Memory: 60.7 GiB Architecture: x86_64 GPU: AMD Radeon Graphics (RADV RENOIR) || radv || Mesa 26.1.2 Installed from nixpkgs on NixOS 26.11pre1011622.a799d3e3886d (Zokor) <!-- Wiki: https://codeberg.org/GramEditor/gram/wiki/Feature-Requests Docs: https://gram-editor.com/docs/ Chat: https://slidge.im/gram/#/guest?join=gram@rooms.slidge.im This issue tracker is mainly for tracking and dealing with bugs. - If you want to make a feature request or have an idea for improvements, please create a page on the Wiki instead of opening an issue. - If you have a question about how the software works or how to configure it, check the wiki guides or the documentation, or join the chatroom and ask there first. If the question turns out to be a missing feature, create a feature request. If it's a bug, come back and create an issue. If your issue really is a bug that you've found: - Is it caused by hardware, for example missing support for your particular graphics device? If so, you are probably the person best suited to solve the problem since you are the one able to reproduce it. Start by trying to work out as much about the cause of the issue yourself, and include as much detail as you can in the issue. See the guide to debugging crashes in the documentation for more information on retrieving logs or using a debugger with Gram. - Is it a packaging problem, like missing builds for Windows, missing packages for your architecture or support needed for a particular Linux distribution? Just like in the previous case, you are probably the one most able to fix the problem yourself. There is a mirror of the repository on Github only so that we can run Github Actions on platforms that we don't have runners for on Codeberg. Contributions to improve the workflows for both Forgejo and Github are welcome. For any other issues, try to investigate the problem before creating an issue. This is a code editor, you as a user of this editor is presumably a coder. Don't let your preconceived notions about what you are capable of limit you in familiarising yourself with your tools. Everyone benefits if you become able to resolve the issues you encounter yourself. Thank you <3 / one grumpy toad with limited time on this earth -->
Sign in to join this conversation.
main
main
test/wgpu-on-mac
test-ci/failing-test-mac
test/failing-test-mac
test/build-on-22-04
test/wgpu-present-mode-mailbox
v2.1
test/altgr-fix-again
test/2.0.0-rc1
test/linux-build
test/objc2
v1.2.1
3.0.1
3.0.0
2.2.0
2.1.2
2.1.1
2.1.0
2.0.0
1.2.1
1.2.0
1.1.0
1.0.0
Milestone
Clear milestone
No items
No milestone
Projects
Clear projects
No items
No project
Assignees
Clear assignees
No assignees
1 participant
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference
GramEditor/gram#355
Reference in a new issue
GramEditor/gram
No description provided.
Delete branch "%!s()"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?