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

Update style for merge commits #1121

Merged
merged 3 commits into from Mar 6, 2018
Merged

Update style for merge commits #1121

merged 3 commits into from Mar 6, 2018

Conversation

fregante
Copy link
Member

@fregante fregante commented Feb 28, 2018

Fixes #1052

Test on https://github.com/babel/babel/commits/master?after=ddd40bf5c7ad8565fc990f26142f85613958a329+104

Notice: GitHub doesn't show the commit directly below the merge. The merged commit in this case is the third one, Andarist's

merge commit screenshot

@sindresorhus
Copy link
Member

It's a little bit weird that the author avatar shows behind the merge icon. The merge icon should not act like an avatar. The tooltip also shows on the merge icon, and it's broken:

screen shot 2018-03-03 at 01 05 17

@fregante
Copy link
Member Author

fregante commented Mar 2, 2018

I tried putting the icon on the first line but it was hard to align it with the avatar. Not much choice other than making it 2-lines tall, but that'd make merges more visible, not less. Suggestions?

@sindresorhus
Copy link
Member

How about something like this:

screen shot 2018-03-03 at 01 42 07

You can achieve that by just absolutely positioning the icon with adjusted top, and the padding-left on the first line. I would also make the merge icon smaller than in my above screenshot.

@fregante
Copy link
Member Author

fregante commented Mar 2, 2018

This is what I'm talking about. Does it look aligned?

Because it basically is 😅


If I align the text, the icon will look too far:

See? Text is aligned:

@sindresorhus
Copy link
Member

Yeah, I get it now, but I can't think of a better way to present it either.

@sindresorhus
Copy link
Member

Do we really need the icon at all?

@fregante
Copy link
Member Author

fregante commented Mar 2, 2018

Wellllll... it is more refined

@fregante
Copy link
Member Author

fregante commented Mar 6, 2018

I think it's good enough for now, better than broken. The current positioning is not offensively off. 😸

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants