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 | |
| 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**
**After**
See merge request !4765
| -rw-r--r-- | app/assets/stylesheets/framework/markdown_area.scss | 2 | ||||
| -rw-r--r-- | app/assets/stylesheets/framework/mixins.scss | 14 | ||||
| -rw-r--r-- | app/assets/stylesheets/pages/notes.scss | 16 |
3 files changed, 19 insertions, 13 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; } } diff --git a/app/assets/stylesheets/framework/mixins.scss b/app/assets/stylesheets/framework/mixins.scss index 828e7224231..5ec5a96a597 100644 --- a/app/assets/stylesheets/framework/mixins.scss +++ b/app/assets/stylesheets/framework/mixins.scss @@ -110,3 +110,17 @@ font-size: 16px; line-height: 24px; } + +@mixin bulleted-list { + > ul { + list-style-type: disc; + + ul { + list-style-type: circle; + + ul { + list-style-type: square; + } + } + } +}
\ No newline at end of file diff --git a/app/assets/stylesheets/pages/notes.scss b/app/assets/stylesheets/pages/notes.scss index df0c241bbf1..ffba3dc5bc6 100644 --- a/app/assets/stylesheets/pages/notes.scss +++ b/app/assets/stylesheets/pages/notes.scss @@ -84,24 +84,14 @@ ul.notes { word-wrap: break-word; @include md-typography; + // Reset ul style types since we're nested inside a ul already + @include bulleted-list; + // On diffs code should wrap nicely and not overflow code { white-space: pre-wrap; } - // Reset ul style types since we're nested inside a ul already - & > ul { - list-style-type: disc; - - ul { - list-style-type: circle; - - ul { - list-style-type: square; - } - } - } - ul.task-list { ul:not(.task-list) { padding-left: 1.3em; |