diff options
author | Filipa Lacerda <filipa@gitlab.com> | 2018-03-19 17:54:19 +0000 |
---|---|---|
committer | Filipa Lacerda <filipa@gitlab.com> | 2018-03-19 17:54:19 +0000 |
commit | 7f81a324ed75f49f624d1112033d79fcd522d249 (patch) | |
tree | 5f39967f79fb15e67002c842b9e8ff178ba13134 | |
parent | a520ab64db0ba9815627c197c60139d1a9a5c6d4 (diff) | |
parent | 7e0635bde058278aa76110780caf359eeca3ea86 (diff) | |
download | gitlab-ce-7f81a324ed75f49f624d1112033d79fcd522d249.tar.gz |
Merge branch '44384-cleanup-css-for-nested-lists' into 'master'
Unify format for nested non-task lists
Closes #44384
See merge request gitlab-org/gitlab-ce!17823
-rw-r--r-- | app/assets/stylesheets/pages/notes.scss | 6 | ||||
-rw-r--r-- | changelogs/unreleased/44384-cleanup-css-for-nested-lists.yml | 5 |
2 files changed, 5 insertions, 6 deletions
diff --git a/app/assets/stylesheets/pages/notes.scss b/app/assets/stylesheets/pages/notes.scss index 085a2e74328..81e98f358a8 100644 --- a/app/assets/stylesheets/pages/notes.scss +++ b/app/assets/stylesheets/pages/notes.scss @@ -140,12 +140,6 @@ ul.notes { @include bulleted-list; word-wrap: break-word; - ul.task-list { - ul:not(.task-list) { - padding-left: 1.3em; - } - } - table { @include markdown-table; } diff --git a/changelogs/unreleased/44384-cleanup-css-for-nested-lists.yml b/changelogs/unreleased/44384-cleanup-css-for-nested-lists.yml new file mode 100644 index 00000000000..79c470ea4e1 --- /dev/null +++ b/changelogs/unreleased/44384-cleanup-css-for-nested-lists.yml @@ -0,0 +1,5 @@ +--- +title: Unify format for nested non-task lists +merge_request: 17823 +author: Takuya Noguchi +type: fixed |