ZIm/crates/theme/src
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
..
styles Refine styling of merge conflicts (#31012) 2025-06-09 19:03:19 +00:00
default_colors.rs Refine styling of merge conflicts (#31012) 2025-06-09 19:03:19 +00:00
fallback_themes.rs Refine styling of merge conflicts (#31012) 2025-06-09 19:03:19 +00:00
font_family_cache.rs Eliminate GPUI View, ViewContext, and WindowContext types (#22632) 2025-01-26 03:02:45 +00:00
icon_theme.rs Update terminal file icon associations in "FILE_SUFFIX_BY_ICON_KEY" (#31110) 2025-05-26 11:22:43 +03:00
icon_theme_schema.rs Allow icon themes to provide their own file associations (#24926) 2025-02-15 00:35:13 +00:00
registry.rs chore: Bump Rust edition to 2024 (#27800) 2025-03-31 20:55:27 +02:00
scale.rs Eliminate GPUI View, ViewContext, and WindowContext types (#22632) 2025-01-26 03:02:45 +00:00
schema.rs Refine styling of merge conflicts (#31012) 2025-06-09 19:03:19 +00:00
settings.rs Fix prevent zero value for buffer line height (#30832) 2025-05-19 00:55:35 +00:00
styles.rs theme crate spring cleaning (#18695) 2024-10-03 13:17:31 -04:00
theme.rs chore: Bump Rust edition to 2024 (#27800) 2025-03-31 20:55:27 +02:00