From 843f79662ff5ff5660442f4dfbfd24f7478acc1d Mon Sep 17 00:00:00 2001
From: Sergey Bedritsky <sergey.bedritsky@gmail.com>
Date: Wed, 30 Jun 2021 20:58:48 +0300
Subject: [PATCH] fix: prose nested lists (#529)

* fix: prose nested lists

* cleanup
---
 .../components/atoms/prose/ProseLi.vue        |  4 +--
 .../components/atoms/prose/ProseOl.vue        | 35 ++-----------------
 .../components/atoms/prose/ProseUl.vue        |  6 ++--
 3 files changed, 8 insertions(+), 37 deletions(-)

diff --git a/src/defaultTheme/components/atoms/prose/ProseLi.vue b/src/defaultTheme/components/atoms/prose/ProseLi.vue
index 50078184f..a98ead3af 100644
--- a/src/defaultTheme/components/atoms/prose/ProseLi.vue
+++ b/src/defaultTheme/components/atoms/prose/ProseLi.vue
@@ -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) '.';
diff --git a/src/defaultTheme/components/atoms/prose/ProseOl.vue b/src/defaultTheme/components/atoms/prose/ProseOl.vue
index 05b61441e..bc71c03c5 100644
--- a/src/defaultTheme/components/atoms/prose/ProseOl.vue
+++ b/src/defaultTheme/components/atoms/prose/ProseOl.vue
@@ -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>
diff --git a/src/defaultTheme/components/atoms/prose/ProseUl.vue b/src/defaultTheme/components/atoms/prose/ProseUl.vue
index 8da9803db..65aefa96c 100644
--- a/src/defaultTheme/components/atoms/prose/ProseUl.vue
+++ b/src/defaultTheme/components/atoms/prose/ProseUl.vue
@@ -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>