ZIm/assets/themes
Nate Butler 0b7583bae5
Refine styling of merge conflicts (#31012)
- Improved colors
- Blank out diff hunk gutter highlights in conflict regions
- Paint conflict marker highlights all the way to the gutter

Release Notes:

- Improved the highlighting of merge conflict markers in editors.

---------

Co-authored-by: Marshall Bowers <git@maxdeviant.com>
Co-authored-by: Cole Miller <cole@zed.dev>
2025-06-09 19:03:19 +00:00
..
ayu Improve CSS syntax highlighting (#25326) 2025-06-06 17:14:32 -04:00
gruvbox Improve CSS syntax highlighting (#25326) 2025-06-06 17:14:32 -04:00
one Refine styling of merge conflicts (#31012) 2025-06-09 19:03:19 +00:00
.gitkeep Removed stray compiled theme files 2022-09-08 15:51:39 -07:00
LICENSES Remove legacy themes and licenses (#24589) 2025-02-14 21:49:23 +00:00