Skip to content

editor: Add FlexClipped block style and use it for spacer blocks#49478

Merged
cole-miller merged 1 commit intomainfrom
flex-no-gutter
Feb 18, 2026
Merged

editor: Add FlexClipped block style and use it for spacer blocks#49478
cole-miller merged 1 commit intomainfrom
flex-no-gutter

Conversation

@cole-miller
Copy link
Member

@cole-miller cole-miller commented Feb 18, 2026

FlexClipped acts like Flex, but only allows the block to render in the main hitbox, not the gutter. This is a visual improvement for the spacers compared to Sticky.

Screen.Recording.2026-02-18.at.8.33.53.AM.mov

Release Notes:

  • git: Improved the visual display for spacers in the split diff view.

@cole-miller cole-miller requested a review from a team as a code owner February 18, 2026 13:43
@cla-bot cla-bot bot added the cla-signed The user has signed the Contributor License Agreement label Feb 18, 2026
@zed-community-bot zed-community-bot bot added the staff Pull requests authored by a current member of Zed staff label Feb 18, 2026
@cole-miller
Copy link
Member Author

/cherry-pick preview

Co-authored-by: Smit Barmase <heysmitbarmase@gmail.com>
@cole-miller cole-miller enabled auto-merge (squash) February 18, 2026 15:36
@cole-miller cole-miller merged commit a1af11c into main Feb 18, 2026
27 checks passed
@cole-miller cole-miller deleted the flex-no-gutter branch February 18, 2026 15:45
github-actions bot pushed a commit that referenced this pull request Feb 18, 2026
…49478)

`FlexClipped` acts like `Flex`, but only allows the block to render in
the main hitbox, not the gutter. This is a visual improvement for the
spacers compared to `Sticky`.


https://github.com/user-attachments/assets/2b0aed0c-91ff-4e74-85b1-aea81f4e8a35


Release Notes:

- git: Improved the visual display for spacers in the split diff view.

Co-authored-by: Smit Barmase <heysmitbarmase@gmail.com>
cole-miller added a commit that referenced this pull request Feb 18, 2026
…49478) (cherry-pick to preview) (#49492)

Cherry-pick of #49478 to preview

----
`FlexClipped` acts like `Flex`, but only allows the block to render in
the main hitbox, not the gutter. This is a visual improvement for the
spacers compared to `Sticky`.



https://github.com/user-attachments/assets/2b0aed0c-91ff-4e74-85b1-aea81f4e8a35


Release Notes:

- git: Improved the visual display for spacers in the split diff view.

Co-authored-by: Smit Barmase <heysmitbarmase@gmail.com>

Co-authored-by: Cole Miller <cole@zed.dev>
Co-authored-by: Smit Barmase <heysmitbarmase@gmail.com>
cole-miller added a commit that referenced this pull request Feb 18, 2026
github-actions bot pushed a commit that referenced this pull request Feb 18, 2026
github-actions bot pushed a commit that referenced this pull request Feb 18, 2026
cole-miller added a commit that referenced this pull request Feb 18, 2026
cole-miller added a commit that referenced this pull request Feb 18, 2026
…locks" (#49508) (cherry-pick to preview) (#49510)

Cherry-pick of #49508 to preview

----
Reverts #49478

Co-authored-by: Cole Miller <cole@zed.dev>
cole-miller added a commit that referenced this pull request Feb 18, 2026
…locks" (#49508) (cherry-pick to v0.225.x) (#49511)

Reverts #49478

Release Notes:

- N/A *or* Added/Fixed/Improved ...
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

cla-signed The user has signed the Contributor License Agreement staff Pull requests authored by a current member of Zed staff

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant