Commit 2d810b61 authored by Alfredo Sumaran's avatar Alfredo Sumaran Committed by Jacob Schatz

Move todo target state to the top and fix styles on mobile

parent 38d6bc77
...@@ -37,6 +37,9 @@ ...@@ -37,6 +37,9 @@
float: none; float: none;
display: inline-block; display: inline-block;
font-weight: normal; font-weight: normal;
padding: 0 5px;
line-height: inherit;
font-size: 14px;
} }
.todo-body { .todo-body {
...@@ -84,12 +87,11 @@ ...@@ -84,12 +87,11 @@
@media (max-width: $screen-xs-max) { @media (max-width: $screen-xs-max) {
.todo-item { .todo-item {
padding-left: $gl-padding;
.todo-title { .todo-title {
white-space: normal; white-space: normal;
overflow: visible; overflow: visible;
max-width: 100%; max-width: 100%;
margin-bottom: 10px;
} }
.avatar { .avatar {
......
...@@ -3,6 +3,10 @@ ...@@ -3,6 +3,10 @@
= image_tag avatar_icon(todo.author_email, 40), class: 'avatar s40', alt:'' = image_tag avatar_icon(todo.author_email, 40), class: 'avatar s40', alt:''
.todo-title.title .todo-title.title
- unless todo.build_failed? - 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 %span.author-name
- if todo.author - if todo.author
= link_to_author(todo) = link_to_author(todo)
...@@ -17,10 +21,6 @@ ...@@ -17,10 +21,6 @@
· #{time_ago_with_tooltip(todo.created_at)} · #{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? - if todo.pending?
.todo-actions.pull-right .todo-actions.pull-right
= link_to [:dashboard, todo], method: :delete, class: 'btn btn-loading done-todo' do = link_to [:dashboard, todo], method: :delete, class: 'btn btn-loading done-todo' do
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment