kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Merge branch '59930-todos-scss' into 'master'

Browse source 
Cleans up todos.scss style-lint warnings

Closes #59930

See merge request gitlab-org/gitlab-ce!28076
This commit is contained in:
Phil Hughes 2019-05-07 07:57:31 +00:00
commit 5cd079e434
2 changed files with 28 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

61
app/assets/stylesheets/pages/todos.scss
View file

@ -110,45 +110,38 @@
} }
.todo-body { .todo-body {
.todo-note { .badge.badge-pill,
word-wrap: break-word; p {
color: $gl-text-color;
}
.md { .md {
color: $gl-grayish-blue; color: $gl-grayish-blue;
font-size: $gl-font-size; font-size: $gl-font-size;
}
.badge.badge-pill { code {
color: $gl-text-color; white-space: pre-wrap;
} }
p { pre {
color: $gl-text-color; border: 0;
} background: $gray-light;
} border-radius: 0;
color: $gl-gray-500;
margin: 0 20px;
overflow: hidden;
}
code { .note-image-attach {
white-space: pre-wrap; margin-top: 4px;
} margin-left: 0;
max-width: 200px;
float: none;
}
pre { p:last-child {
border: 0; margin-bottom: 0;
background: $gray-light;
border-radius: 0;
color: $gl-gray-500;
margin: 0 20px;
overflow: hidden;
}
.note-image-attach {
margin-top: 4px;
margin-left: 0;
max-width: 200px;
float: none;
}
p:last-child {
margin-bottom: 0;
}
} }
} }
} }

2
app/views/dashboard/todos/_todo.html.haml
View file

@ -34,7 +34,7 @@
= todo_due_date(todo) = todo_due_date(todo)
.todo-body .todo-body
.todo-note .todo-note.break-word
.md .md
= first_line_in_markdown(todo, :body, 150, project: todo.project) = first_line_in_markdown(todo, :body, 150, project: todo.project)