diff options
| author | Alfredo Sumaran <alfredo@gitlab.com> | 2016-04-28 15:43:18 -0500 |
|---|---|---|
| committer | Jacob Schatz <jschatz1@gmail.com> | 2016-05-25 08:15:20 -0400 |
| commit | 2d810b61ad18920845f6aaafdbd5c63798691a9c (patch) | |
| tree | 48291b0bc443a2319a92cc12e29f553869e32d06 /app/views/dashboard/todos/_todo.html.haml | |
| parent | 38d6bc77f9d0b9be1d953d436384e2b023b465c5 (diff) | |
| download | gitlab-ce-2d810b61ad18920845f6aaafdbd5c63798691a9c.tar.gz | |
Move todo target state to the top and fix styles on mobile
Diffstat (limited to 'app/views/dashboard/todos/_todo.html.haml')
| -rw-r--r-- | app/views/dashboard/todos/_todo.html.haml | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/app/views/dashboard/todos/_todo.html.haml b/app/views/dashboard/todos/_todo.html.haml index 1f4a03cda2e..45dbc234cbc 100644 --- a/app/views/dashboard/todos/_todo.html.haml +++ b/app/views/dashboard/todos/_todo.html.haml @@ -3,6 +3,10 @@ = image_tag avatar_icon(todo.author_email, 40), class: 'avatar s40', alt:'' .todo-title.title - unless todo.build_failed? + - if (todo.target.is_a?(MergeRequest) || todo.target.is_a?(Issue)) && ['closed', 'merged'].include?(todo.target.state) + %span.target-status + = todo_target_state_pill(todo) + %span.author-name - if todo.author = link_to_author(todo) @@ -17,10 +21,6 @@ · #{time_ago_with_tooltip(todo.created_at)} - - if (todo.target.is_a?(MergeRequest) || todo.target.is_a?(Issue)) && ['closed', 'merged'].include?(todo.target.state) - %span.target-status - = todo_target_state_pill(todo) - - if todo.pending? .todo-actions.pull-right = link_to [:dashboard, todo], method: :delete, class: 'btn btn-loading done-todo' do |