diff options
| author | Phil Hughes <me@iamphill.com> | 2019-05-07 07:57:31 +0000 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2019-05-07 07:57:31 +0000 |
| commit | 5cd079e43498982dcef59e32ebf03d6fe6a06286 (patch) | |
| tree | ba2efb475637a5ed1f094616dc5a0fac1179e697 | |
| parent | 06b06736eb314bf4144ae50400fbe9d8f8f3cae7 (diff) | |
| parent | 7c57c953c6691289cc4b94cf251f9e3b2a3a9131 (diff) | |
| download | gitlab-ce-5cd079e43498982dcef59e32ebf03d6fe6a06286.tar.gz | |
Merge branch '59930-todos-scss' into 'master'
Cleans up todos.scss style-lint warnings
Closes #59930
See merge request gitlab-org/gitlab-ce!28076
| -rw-r--r-- | app/assets/stylesheets/pages/todos.scss | 61 | ||||
| -rw-r--r-- | app/views/dashboard/todos/_todo.html.haml | 2 |
2 files changed, 28 insertions, 35 deletions
diff --git a/app/assets/stylesheets/pages/todos.scss b/app/assets/stylesheets/pages/todos.scss index 2a1e8345755..586365eb1ce 100644 --- a/app/assets/stylesheets/pages/todos.scss +++ b/app/assets/stylesheets/pages/todos.scss @@ -110,45 +110,38 @@ } .todo-body { - .todo-note { - word-wrap: break-word; - - .md { - color: $gl-grayish-blue; - font-size: $gl-font-size; - - .badge.badge-pill { - color: $gl-text-color; - } + .badge.badge-pill, + p { + color: $gl-text-color; + } - p { - color: $gl-text-color; - } - } + .md { + color: $gl-grayish-blue; + font-size: $gl-font-size; + } - code { - white-space: pre-wrap; - } + code { + white-space: pre-wrap; + } - pre { - border: 0; - background: $gray-light; - border-radius: 0; - color: $gl-gray-500; - margin: 0 20px; - overflow: hidden; - } + pre { + border: 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; - } + .note-image-attach { + margin-top: 4px; + margin-left: 0; + max-width: 200px; + float: none; + } - p:last-child { - margin-bottom: 0; - } + p:last-child { + margin-bottom: 0; } } } diff --git a/app/views/dashboard/todos/_todo.html.haml b/app/views/dashboard/todos/_todo.html.haml index efe1fb99efc..db6e40a6fd0 100644 --- a/app/views/dashboard/todos/_todo.html.haml +++ b/app/views/dashboard/todos/_todo.html.haml @@ -34,7 +34,7 @@ = todo_due_date(todo) .todo-body - .todo-note + .todo-note.break-word .md = first_line_in_markdown(todo, :body, 150, project: todo.project) |