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

Deemphasize update-pr-from-base-branch button #3154

Merged
merged 6 commits into from May 30, 2020

Conversation

FloEdelmann
Copy link
Member

@FloEdelmann FloEdelmann commented May 28, 2020

Closes #2723, closes #3017.

I've taken a little different approach than outlined in #2723: Always add the button as a .btn-link to the .status-meta, and also show .status-meta for success status messages if necessary. That way, we don't have to deal with different locations for the same button.

I hope I have tested all cases, please everyone try this in other PRs with different status messages!

Screenshot_2020-05-28_20-40-27
Screenshot_2020-05-29_17-26-54
Screenshot_2020-05-29_17-27-21
Screenshot_2020-05-29_17-30-12
Screenshot_2020-05-28_20-42-02
Screenshot_2020-05-28_20-44-03

@fregante
Copy link
Member

Excellent! However I think this undoes clean-mergeability-box at least partially. Can you just add an extra line and only unhide that (with :not()) rather than the whole line that we normally hide?

@FloEdelmann
Copy link
Member Author

I've put it inside a separate .status-meta, and it even stays on the same line because both are display: inline; 😊

@fregante
Copy link
Member

I see it on this PR

but not on #3153:

draft

Is this due to #3155?

@FloEdelmann
Copy link
Member Author

FloEdelmann commented May 30, 2020

@fregante Probably, since I didn't change the logic when to show the button in this PR, just where and how.

Could you check if the button is maybe added in a hidden section?

In a similar case (OpenLightingProject/open-fixture-library#359: I have write access to the repo, someone else opened a draft PR that is now out-of-date), I see it's added for me (both in the current version and the updated look) when I disable the Require branches to be up to date before merging branch setting.

@fregante
Copy link
Member

fregante commented May 30, 2020

It doesn't seem related to this PR. The button doesn't appear on master either.

Could you check if the button is maybe added in a hidden section?

It's not. I posted the DOM structure in #3155

I'll test this further and merge it

@fregante fregante merged commit 4275cbd into refined-github:master May 30, 2020
@fregante
Copy link
Member

🙌

@FloEdelmann FloEdelmann deleted the deemphasize-update-branch branch May 30, 2020 15:57
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Development

Successfully merging this pull request may close these issues.

Update branch button is misaligned on a draft PR Make update-pr-from-base-branch's button smaller
2 participants