Avoid "Use me" <atom-overlay> to scroll over conflicts panel

smashwilson / merge-conflicts

Resolve git merge conflicts in Atom

https://atom.io/packages/merge-conflicts

MIT License

431 stars 42 forks source link

Avoid "Use me" <atom-overlay> to scroll over conflicts panel #235

Closed orioltf closed 8 years ago

orioltf commented 8 years ago

Scrolling a large file with conflicts shows the "Use-me" overlays over the "conflicts" panel:

screen shot 2016-05-17 at 12 30 43

This can be easily solved by increasing the z-index from the "Conflicts panel". I added the position: relative; too to avoid possible breaks if the tag <atom-panel /> ever gets its position: relative; removed.

smashwilson commented 8 years ago

Oh hey, is it that simple? Thanks!

smashwilson commented 8 years ago

Published as v1.4.3 :rocket:

orioltf commented 8 years ago

Nice! :)