Buttons in merge conflict page are clipped

Proposal

Fix the button clipping on the merge conflict page for the inline view

Current Proposal
image image

Implementation plan

The issue is that the min-height for the gl-button is set to 1.5rem so that makes the button 24px tall as a minimum. The stylesheet for the merge conflict page has these buttons to be set at 18px.

  • Add a min-height property to the ".line-content.header button" entry in the file app/assets/stylesheets/page_bundles/merge_conflicts.scss (line 97) to be equal to the height
    • min-height: 18px
Edited by Michael Le