From 2d810b61ad18920845f6aaafdbd5c63798691a9c Mon Sep 17 00:00:00 2001 From: Alfredo Sumaran Date: Thu, 28 Apr 2016 15:43:18 -0500 Subject: Move todo target state to the top and fix styles on mobile --- app/views/dashboard/todos/_todo.html.haml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'app/views/dashboard') 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 -- cgit v1.2.3