diff options
| author | Phil Hughes <me@iamphill.com> | 2016-05-23 14:58:48 +0100 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2016-05-23 14:58:48 +0100 |
| commit | e76d11dce96672a6f791fb4f249a3c1384f0a7f0 (patch) | |
| tree | 42daa1e99db9bde89c683fcbba4182720114ee10 | |
| parent | 53ad33e4ba1b079e4f2aebceb42a7301c5ce2e4a (diff) | |
| download | gitlab-ce-closed-by-alignment.tar.gz | |
Related merge request text alignmentclosed-by-alignment
| -rw-r--r-- | app/assets/stylesheets/pages/issues.scss | 5 | ||||
| -rw-r--r-- | app/views/projects/issues/_merge_requests.html.haml | 5 |
2 files changed, 4 insertions, 6 deletions
diff --git a/app/assets/stylesheets/pages/issues.scss b/app/assets/stylesheets/pages/issues.scss index fc9db97132d..58bd12ffd6b 100644 --- a/app/assets/stylesheets/pages/issues.scss +++ b/app/assets/stylesheets/pages/issues.scss @@ -96,8 +96,3 @@ form.edit-issue { .issue-form .select2-container { width: 250px !important; } - -.issue-closed-by-widget { - color: $gl-text-color; - margin-left: 52px; -} diff --git a/app/views/projects/issues/_merge_requests.html.haml b/app/views/projects/issues/_merge_requests.html.haml index e953353567e..2f9dc867d0d 100644 --- a/app/views/projects/issues/_merge_requests.html.haml +++ b/app/views/projects/issues/_merge_requests.html.haml @@ -24,5 +24,8 @@ MERGED - elsif merge_request.closed? CLOSED - - if @closed_by_merge_requests.present? + %li = render partial: 'projects/issues/closed_by_box', locals: {merge_request_count: @merge_requests.count} + - if @closed_by_merge_requests.present? + %li + = render partial: 'projects/issues/closed_by_box', locals: {merge_request_count: @merge_requests.count} |