diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-12-09 17:06:30 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-12-09 17:06:30 +0000 |
| commit | 8440290f6a11ae9af3d24bb88b0ea0cfedca3427 (patch) | |
| tree | 7d1166b1d0cb0cfb28c85dbafa7d8b33805cc9b7 | |
| parent | 608a7275167225d03e3a4556ecbd32b6f5602d66 (diff) | |
| parent | 53fbb0ecda36be783a46413f59551f13090ea9df (diff) | |
| download | gitlab-ce-8440290f6a11ae9af3d24bb88b0ea0cfedca3427.tar.gz | |
Merge branch 'rs-list-styling' into 'master'
Improve styling for mixed list styles
Tasks in an ordered list will now also show their numbers.
Closes #2488
Related to #3921
See merge request !2026
| -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; } } |