Merge conflicts and other messages warning that a merge cannot happen aren't clear enough in mr widget
Resources
FE: @psimyn
Issue idea came from: https://gitlab.com/gitlab-org/gitlab-ee/issues/1126#note_30132958 and slack discussion https://gitlab.slack.com/archives/C03MSG8B7/p1495184189757297
It is partly solved by introducing horizontal lines in the mr-widget to improve visual separation of content, see for examples of that at https://gitlab.com/gitlab-org/gitlab-ee/issues/1126
Problem
Currently with the introduction of the redesign of the mr-widget we can begin to enhance and build upon it. We will be introducing more features to it that build on the design and code system introduced. However messages which convey information that a merge request cannot be merged are insufficiently visual/impactful.
Currently apart from messages like "merge conflicts prevent merge" there are more visual indicators indicating other problems like, failed ci/cd pipelines, successful deploys or code climate changes https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/11379#note_29931113 . These are indicated with visual icons.. while for the warnings we'll need to improve only text is available.. making them less visual and less digestable.
Proposal
Make warning messages preventing merge more visual
Design
- Buttons at the beginning of a sentence with a static position should be slightly bigger (30 px height)
- Buttons at the end of a sentence, with a non-static position (inline) should be smaller (25 px height)
- This introduced the X status icon when there is something preventing the merge to happen.
- The merge button then stays visible, but is in a disabled state and shift position while becoming a slightly smaller inline position at the end of the warning message.
CC/Call to actions
@filipa @hazelyang @sarrahvesselov @fatihacet (you may be interested in this conversation)