diff options
| author | Robert Speicher <rspeicher@gmail.com> | 2015-12-08 16:53:48 -0500 |
|---|---|---|
| committer | Robert Speicher <rspeicher@gmail.com> | 2015-12-08 16:53:48 -0500 |
| commit | 53fbb0ecda36be783a46413f59551f13090ea9df (patch) | |
| tree | 9c1974944dd1c8c85725594583343ccc01476140 | |
| parent | d1ee3b7bad4561947709f9e4b2e90b310fc1788e (diff) | |
| download | gitlab-ce-rs-list-styling.tar.gz | |
Improve styling for mixed list stylesrs-list-styling
Tasks in an ordered list will now also show their numbers.
Closes #2488
Related to #3921
| -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; } } |