diff options
| author | Douglas Barbosa Alexandre <dbalexandre@gmail.com> | 2015-12-09 16:31:15 -0200 |
|---|---|---|
| committer | Douglas Barbosa Alexandre <dbalexandre@gmail.com> | 2015-12-09 16:31:15 -0200 |
| commit | 4a29669dec880a030c9c9d5cebf99ad58781cf9f (patch) | |
| tree | 4268364249de9a288741b52afb2ddebbf3e13a3e /app/assets | |
| parent | 364041e7ddf56a16a90f35ec85e35c05e5758621 (diff) | |
| parent | cfe46f485da6e45ddb9f64d471b92892579dd9b7 (diff) | |
| download | gitlab-ce-4a29669dec880a030c9c9d5cebf99ad58781cf9f.tar.gz | |
Merge branch 'master' into fix-edit-notes-on-merge-request-diff
Diffstat (limited to 'app/assets')
| -rw-r--r-- | app/assets/stylesheets/framework/lists.scss | 10 | ||||
| -rw-r--r-- | app/assets/stylesheets/pages/notes.scss | 10 |
2 files changed, 11 insertions, 9 deletions
diff --git a/app/assets/stylesheets/framework/lists.scss b/app/assets/stylesheets/framework/lists.scss index 927641216e4..f770e535b30 100644 --- a/app/assets/stylesheets/framework/lists.scss +++ b/app/assets/stylesheets/framework/lists.scss @@ -88,8 +88,14 @@ ul.bordered-list { } } -li.task-list-item { - list-style-type: none; +ul.task-list { + li.task-list-item { + list-style-type: none; + } + + ul:not(.task-list) { + padding-left: 1.3em; + } } ul.content-list { diff --git a/app/assets/stylesheets/pages/notes.scss b/app/assets/stylesheets/pages/notes.scss index 1980fe0d458..4dff87abaa4 100644 --- a/app/assets/stylesheets/pages/notes.scss +++ b/app/assets/stylesheets/pages/notes.scss @@ -109,13 +109,9 @@ ul.notes { } } - // Reduce left padding of first task list ul element - ul.task-list:first-child { - padding-left: 10px; - - // sub-tasks should be padded normally - ul { - padding-left: 20px; + ul.task-list { + ul:not(.task-list) { + padding-left: 1.3em; } } |