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

style: merge editor style fix #3233

Merged
merged 1 commit into from
Jan 4, 2024
Merged

style: merge editor style fix #3233

merged 1 commit into from
Jan 4, 2024

Conversation

AhkunTa
Copy link
Member

@AhkunTa AhkunTa commented Dec 7, 2023

Types

  • 💄 Style Changes

Background or solution

🤖[deprecated] Generated by Copilot at ffe34b4

  • Fix scroll bar overlap bug in merge editor by changing padding-bottom to margin-bottom for .merge-editor class (link)

Changelog

  • style: merge editor bottom action buttons position fix

🤖[deprecated] Generated by Copilot at ffe34b4

Fixed a UI bug in the merge editor that caused the content to overlap with the scroll bar. Changed the CSS property padding-bottom to margin-bottom in merge-editor.module.less.

@AhkunTa AhkunTa changed the base branch from v2.27 to main December 11, 2023 12:08
Copy link

codecov bot commented Dec 11, 2023

Codecov Report

All modified and coverable lines are covered by tests ✅

Comparison is base (08dea33) 57.62% compared to head (be9370b) 57.63%.

Additional details and impacted files
@@           Coverage Diff           @@
##             main    #3233   +/-   ##
=======================================
  Coverage   57.62%   57.63%           
=======================================
  Files        1340     1340           
  Lines       84544    84544           
  Branches    17587    17587           
=======================================
+ Hits        48720    48723    +3     
+ Misses      32556    32553    -3     
  Partials     3268     3268           
Flag Coverage Δ
jsdom 52.54% <ø> (+<0.01%) ⬆️
node 16.86% <ø> (-0.01%) ⬇️

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@AhkunTa
Copy link
Member Author

AhkunTa commented Dec 14, 2023

/next

@opensumi
Copy link
Contributor

opensumi bot commented Dec 14, 2023

🎉 PR Next version 2.27.2-next-1702525824.0 publish successful! You can install this version via npm install package@2.27.2-next-1702525824.0

2.27.2-next-1702525824.0

@erha19
Copy link
Member

erha19 commented Dec 21, 2023

@AhkunTa 加一下优化前后对比图?

@AhkunTa AhkunTa merged commit d983d10 into main Jan 4, 2024
13 checks passed
@AhkunTa AhkunTa deleted the style/merge-editor branch January 4, 2024 08:43
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
🐞 bug Something isn't working 💄 style change
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants