conflicts - add space between button label and octicon #7302
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
shiftkey
added
the
tech-debt
|
LGTM 🎉 |
shiftkey
added
the
ready-for-review
niik
requested changes
Apr 16, 2019
Co-Authored-By: shiftkey <brendan@github.com>
niik
approved these changes
Apr 16, 2019
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Overview
Closes out this bit of feedback from #7218:
Description
I ended up just focusing on the spacing between the two elements because the "Open in Editor" flow has two buttons (the left button launching the editor, the second button displaying a context menu) and that didn't feel consistent here (because I only have a context menu to show).
Current
developmentbranch - resolving merge and rebase conflict where manual options are required:After this PR:
Release notes
Notes:
[Improved] button style for manual conflict resolution options