Merge branch 'nested-lists-margin-fix' into 'master'

Fix nested lists unnecessary margin Closes #33744 See merge request gitlab-org/gitlab-ce!29775

Merge branch 'nested-lists-margin-fix' into 'master'
Fix nested lists unnecessary margin Closes #33744 See merge request gitlab-org/gitlab-ce!29775
11367613 · Annabel Dunstone Gray · 6d4f33ce · e53c001f · 11367613 · 11367613
Commit 11367613 authored Jun 19, 2019 by Annabel Dunstone Gray
2 changed files
--- 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),

--- a/changelogs/unreleased/29775-fix-nested-lists-unnecessary-margin.yml
+++ b/changelogs/unreleased/29775-fix-nested-lists-unnecessary-margin.yml
+---
+title: Fix nested lists unnecessary margin
+merge_request: 29775
+author: Kuba Kopeć
+type: fixed