kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

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
This commit is contained in:
Jacob Schatz 2016-06-20 20:23:16 +00:00
parent fc63251fd5 22ea25ae1a
commit 5804b6a0a2
3 changed files with 19 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/stylesheets/framework/markdown_area.scss
View File

@ -102,6 +102,8 @@
white-space: pre-wrap;
word-break: keep-all;
}
@include bulleted-list;
}
}

14
app/assets/stylesheets/framework/mixins.scss
View File

@ -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;
}
}
}
}

16
app/assets/stylesheets/pages/notes.scss
View File

@ -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;