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

Jump to bottom

Merge conflicts dialog visual updates #6399

Merged
merged 3 commits into from Dec 12, 2018
Merged

Merge conflicts dialog visual updates #6399

merged 3 commits into from Dec 12, 2018

Conversation

ampinsk
Copy link
Contributor

@ampinsk ampinsk commented Dec 11, 2018

Closes #6377

This changes a couple of small visual things:

  1. Updates the small text on the modal
  2. Uses the small button size instead of the normal button size on Open in [editor buttons
  3. Increases the max height of the file list

screen shot 2018-12-11 at 1 58 05 pm

@ampinsk ampinsk added this to the 1.6.0 milestone Dec 11, 2018
@ampinsk ampinsk added the ready-for-review Pull Requests that are ready to be reviewed by the maintainers label Dec 11, 2018
@outofambit outofambit self-assigned this Dec 12, 2018
@outofambit outofambit merged commit 101ae76 into master Dec 12, 2018
@outofambit outofambit deleted the conflicts-visual-updates branch December 12, 2018 23:08
@say25
Copy link
Member

say25 commented Dec 12, 2018

@outofambit I think this needs a milestone tweak

@outofambit outofambit modified the milestones: 1.6.0, 1.5.1 Dec 12, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@outofambit outofambit outofambit approved these changes

Assignees

@outofambit outofambit

Labels
ready-for-review Pull Requests that are ready to be reviewed by the maintainers
Projects
None yet
Milestone
1.5.1
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@ampinsk @say25 @outofambit