summaryrefslogtreecommitdiff
path: root/app/assets/stylesheets
diff options
context:
space:
mode:
authorAnnabel Dunstone Gray <annabel.m.gray@gmail.com>2019-06-19 17:13:20 +0000
committerAnnabel Dunstone Gray <annabel.m.gray@gmail.com>2019-06-19 17:13:20 +0000
commit11367613713405e6efa7359efcb8e3791f6b3431 (patch)
treefccac53ee82bb2112ca36e9fb75103825ebcf57f /app/assets/stylesheets
parent6d4f33ceafbf55ae1283352d092c873221fdcbf1 (diff)
parente53c001f4295a175ebb206599af3a1004fcfb61a (diff)
downloadgitlab-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
Diffstat (limited to 'app/assets/stylesheets')
-rw-r--r--app/assets/stylesheets/framework/typography.scss5
1 files changed, 5 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),