search

smashwilson / merge-conflicts

Resolve git merge conflicts in Atom
https://atom.io/packages/merge-conflicts
MIT License
432 stars 42 forks source link

Theme with large buttons hides conflict's first line #250

Closed mateosss closed 6 years ago

mateosss commented 7 years ago

I'm using atom-material-ui theme and it has large buttons, merge-conflicts uses this buttons for showing up the 'use me' buttons, the problem (as showed in the picture below) is that first line after 'our changes' section gets semi-covered, as equal as the first line after the conflict, this image is zoomed in, with normal zoom the lines appear full-covered as if there weren't there.

Can this be fixed from this package or should I request atom-material-ui to get their buttons smaller (which probably they won't do)?

captura de pantalla de 2016-09-19 21-56-12

Thanks for the great package!

ghost commented 7 years ago

@smashwilson Same issue here. Could these be text links instead?

pingshunhuangalex commented 7 years ago

+1, same issue here for material-ui theme (dark).

atychang commented 7 years ago

+1, same issue here. atom 1.12.5 material-ui (dark) base16 tomorrow dark mac os

nickclyde commented 7 years ago

+1 same issue atom 1.12.6 atom-material-ui theme one dark syntax ubuntu 16.04

smashwilson commented 7 years ago

:wave: Thanks for taking the time to file an issue here! Unfortunately, this repository is being deprecated, so I won't be getting to this one here.

This one should be taken care of by the new git and GitHub package for Atom - the conflict controls are block decorations, so they should resize to fit the buttons. If you still see something similar, please file an issue there to let us know. Thanks 🙇

mateosss commented 6 years ago

Thanks for your work in this package! it was very useful, and indeed they solved this issue, so I suppose I should close this.