diff options
| author | Annabel Dunstone Gray <annabel.m.gray@gmail.com> | 2019-06-19 17:13:20 +0000 |
|---|---|---|
| committer | Annabel Dunstone Gray <annabel.m.gray@gmail.com> | 2019-06-19 17:13:20 +0000 |
| commit | 11367613713405e6efa7359efcb8e3791f6b3431 (patch) | |
| tree | fccac53ee82bb2112ca36e9fb75103825ebcf57f | |
| parent | 6d4f33ceafbf55ae1283352d092c873221fdcbf1 (diff) | |
| parent | e53c001f4295a175ebb206599af3a1004fcfb61a (diff) | |
| download | gitlab-ce-11367613713405e6efa7359efcb8e3791f6b3431.tar.gz | |
Merge branch 'nested-lists-margin-fix' into 'master'
Fix nested lists unnecessary margin
Closes #33744
See merge request gitlab-org/gitlab-ce!29775
| -rw-r--r-- | app/assets/stylesheets/framework/typography.scss | 5 | ||||
| -rw-r--r-- | changelogs/unreleased/29775-fix-nested-lists-unnecessary-margin.yml | 5 |
2 files changed, 10 insertions, 0 deletions
diff --git a/app/assets/stylesheets/framework/typography.scss b/app/assets/stylesheets/framework/typography.scss index 9e1431963d9..7baab478034 100644 --- a/app/assets/stylesheets/framework/typography.scss +++ b/app/assets/stylesheets/framework/typography.scss @@ -221,6 +221,11 @@ ol { padding: 0; margin: 0 0 16px; + + ul, + ol { + margin-bottom: 0; + } } ul:dir(rtl), diff --git a/changelogs/unreleased/29775-fix-nested-lists-unnecessary-margin.yml b/changelogs/unreleased/29775-fix-nested-lists-unnecessary-margin.yml new file mode 100644 index 00000000000..e7e43c54bab --- /dev/null +++ b/changelogs/unreleased/29775-fix-nested-lists-unnecessary-margin.yml @@ -0,0 +1,5 @@ +--- +title: Fix nested lists unnecessary margin +merge_request: 29775 +author: Kuba Kopeć +type: fixed |