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:
commit
5804b6a0a2
|
@ -102,6 +102,8 @@
|
|||
white-space: pre-wrap;
|
||||
word-break: keep-all;
|
||||
}
|
||||
|
||||
@include bulleted-list;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -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;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
|
@ -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;
|
||||
|
|
Loading…
Reference in New Issue