diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-12-17 09:09:44 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-12-17 09:09:44 +0000 |
| commit | 8dc4c7b4c7e5bf41d3fc578115335da48476fb86 (patch) | |
| tree | ba2e1c57addbd7734bcd37282011750bc0430c8e | |
| parent | be52c5d2a365d9c517b2ca126cedf07a4eeee592 (diff) | |
| parent | 3162a5a2931b7e7fb117d2880ffd348267169fa9 (diff) | |
| download | gitlab-ce-8dc4c7b4c7e5bf41d3fc578115335da48476fb86.tar.gz | |
Merge branch 'ux/closed-message' into 'master'
Fix ux issue with "This issue will be closed automatically" message
1. Make a nice box for "issue will be closed automatically" message
2. move it below emoji navbar. Otherwise looks wierd.
Fixes #4134
# Before
# After
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
See merge request !2129
| -rw-r--r-- | app/assets/stylesheets/pages/issues.scss | 5 | ||||
| -rw-r--r-- | app/views/projects/issues/_closed_by_box.html.haml | 3 | ||||
| -rw-r--r-- | app/views/projects/issues/_discussion.html.haml | 3 | ||||
| -rw-r--r-- | app/views/projects/issues/show.html.haml | 2 |
4 files changed, 4 insertions, 9 deletions
diff --git a/app/assets/stylesheets/pages/issues.scss b/app/assets/stylesheets/pages/issues.scss index 12b190ef925..70c117f6224 100644 --- a/app/assets/stylesheets/pages/issues.scss +++ b/app/assets/stylesheets/pages/issues.scss @@ -141,11 +141,6 @@ form.edit-issue { } } -.issue-closed-by-widget { - padding: 16px 0; - margin: 0px; -} - .issue-form .select2-container { width: 250px !important; } diff --git a/app/views/projects/issues/_closed_by_box.html.haml b/app/views/projects/issues/_closed_by_box.html.haml index 3c491c1a8b8..de415ae51a4 100644 --- a/app/views/projects/issues/_closed_by_box.html.haml +++ b/app/views/projects/issues/_closed_by_box.html.haml @@ -1,3 +1,2 @@ -.issue-closed-by-widget - = icon('check') +.issue-closed-by-widget.gray-content-block.second-block.white This issue will be closed automatically when merge request #{markdown(merge_requests_sentence(@closed_by_merge_requests), pipeline: :gfm)} is accepted. diff --git a/app/views/projects/issues/_discussion.html.haml b/app/views/projects/issues/_discussion.html.haml index 405bae1bbb9..71c7455f711 100644 --- a/app/views/projects/issues/_discussion.html.haml +++ b/app/views/projects/issues/_discussion.html.haml @@ -8,5 +8,8 @@ .gray-content-block.second-block.oneline-block = render 'votes/votes_block', votable: @issue +- if @closed_by_merge_requests.present? + = render 'projects/issues/closed_by_box' + #notes = render 'projects/notes/notes_with_form' diff --git a/app/views/projects/issues/show.html.haml b/app/views/projects/issues/show.html.haml index 509bad0e5d4..a5d8f367b80 100644 --- a/app/views/projects/issues/show.html.haml +++ b/app/views/projects/issues/show.html.haml @@ -54,8 +54,6 @@ .merge-requests = render 'merge_requests' - - if @closed_by_merge_requests.present? - = render 'projects/issues/closed_by_box' .issue-discussion = render 'projects/issues/discussion' |