Skip to content

fix: prose nested lists #529

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jun 30, 2021
Merged

fix: prose nested lists #529

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a38bfcf
fix: prose nested lists
bdrtsky Jun 30, 2021
887201f
cleanup
bdrtsky Jun 30, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/defaultTheme/components/atoms/prose/ProseLi.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,14 @@ li {
}
}

ul li {
ul > li {
&::before {
@apply absolute left-0 top-[0.5em] d-prose-ul-li-bullet rounded-full w-1.5 h-1.5;
content: '';
}
}

ol li {
ol > li {
&::before {
@apply absolute left-0 top-0 d-secondary-text;
content: counter(list-item, decimal) '.';
Expand Down
35 changes: 3 additions & 32 deletions src/defaultTheme/components/atoms/prose/ProseOl.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,40 +5,11 @@
</template>

<style lang="postcss" scoped>
/* TODO: move prose plugin sources */
ol[type='A'] {
--list-counter-style: upper-alpha;
}
ol[type='a'] {
--list-counter-style: lower-alpha;
}
ol[type='A s'] {
--list-counter-style: upper-alpha;
}
ol[type='a s'] {
--list-counter-style: lower-alpha;
}
ol[type='I'] {
--list-counter-style: upper-roman;
}
ol[type='i'] {
--list-counter-style: lower-roman;
}
ol[type='I s'] {
--list-counter-style: upper-roman;
}
ol[type='i s'] {
--list-counter-style: lower-roman;
}
ol[type='1'] {
--list-counter-style: decimal;
}

ol {
@apply mx-0 p-0 my-[1.25em] list-none;
ul,
ol {
@apply my-[0.5em];
>>> ul,
>>> ol {
@apply !my-[0.5em];
}
}
</style>
6 changes: 3 additions & 3 deletions src/defaultTheme/components/atoms/prose/ProseUl.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@
<style lang="postcss" scoped>
ul {
@apply list-none mx-0 p-0 my-[1.25em];
ul,
ol {
@apply my-[0.5em];
>>> ul,
>>> ol {
@apply !my-[0.5em];
}
}
</style>