diff options
author | Jacob Schatz <jschatz@gitlab.com> | 2016-06-20 20:23:16 +0000 |
---|---|---|
committer | Jacob Schatz <jschatz@gitlab.com> | 2016-06-20 20:23:16 +0000 |
commit | 5804b6a0a28a20b1977ab89e04b15b85475b49e0 (patch) | |
tree | 2ab97161aaddb389b9decd98240d404fa3b3d3f5 /app/assets/stylesheets/framework/markdown_area.scss | |
parent | fc63251fd579b4cc285056442016d500e14e2a11 (diff) | |
parent | 22ea25ae1a7e300d44945571256f5cd78696cf1b (diff) | |
download | gitlab-ce-5804b6a0a28a20b1977ab89e04b15b85475b49e0.tar.gz |
Merge branch 'fix-list-style' into 'master'
Make lists on notes to look the same in preview mode and published
## What does this MR do?
Makes list styles on notes to be the same. Previously the styles weren't shared.
## Screenshots (if relevant)
**Previous**
![label-style-old](/uploads/f121fe99e9255cf0d75185185f51fec2/label-style-old.gif)
**After**
![label-style](/uploads/23febf41aaf8796d250a662fa6dc15d2/label-style.gif)
See merge request !4765
Diffstat (limited to 'app/assets/stylesheets/framework/markdown_area.scss')
-rw-r--r-- | app/assets/stylesheets/framework/markdown_area.scss | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/app/assets/stylesheets/framework/markdown_area.scss b/app/assets/stylesheets/framework/markdown_area.scss index 25f9c50258e..fd8eaa8a691 100644 --- a/app/assets/stylesheets/framework/markdown_area.scss +++ b/app/assets/stylesheets/framework/markdown_area.scss @@ -102,6 +102,8 @@ white-space: pre-wrap; word-break: keep-all; } + + @include bulleted-list; } } |