Merge pull request #13221 from ckeditor/ck/13206-fix-unorder-list-style

Fix (list): Fix unordered list style. Closes: #13206.
ckeditor · Jan 17, 2023 · c37e3cb · c37e3cb
2 parents d091c4e + 97c7cc7
commit c37e3cb
Show file tree

Hide file tree

Showing 4 changed files with 44 additions and 36 deletions.
diff --git a/packages/ckeditor5-list/src/documentlist/documentlistediting.ts b/packages/ckeditor5-list/src/documentlist/documentlistediting.ts
@@ -67,7 +67,9 @@ import ListWalker, {
 	iterateSiblingListBlocks,
 	ListBlocksIterable
 } from './utils/listwalker';
+
 import '../../theme/documentlist.css';
+import '../../theme/list.css';
 
 /**
  * A list of base list model attributes.

diff --git a/packages/ckeditor5-list/src/list/listediting.ts b/packages/ckeditor5-list/src/list/listediting.ts
@@ -46,6 +46,8 @@ import {
 	viewToModelPosition
 } from './converters';
 
+import '../../theme/list.css';
+
 /**
  * The engine of the list feature. It handles creating, editing and removing lists and list items.
  *

diff --git a/packages/ckeditor5-list/theme/list.css b/packages/ckeditor5-list/theme/list.css
@@ -0,0 +1,40 @@
+/*
+ * Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
+ * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
+ */
+
+.ck-content ol {
+	list-style-type: decimal;
+
+	& ol {
+		list-style-type: lower-latin;
+
+		& ol {
+			list-style-type: lower-roman;
+
+			& ol {
+				list-style-type: upper-latin;
+
+				& ol {
+					list-style-type: upper-roman;
+				}
+			}
+		}
+	}
+}
+
+.ck-content ul {
+	list-style-type: disc;
+
+	& ul {
+		list-style-type: circle;
+
+		& ul {
+			list-style-type: square;
+
+			& ul {
+				list-style-type: square;
+			}
+		}
+	}
+}
diff --git a/packages/ckeditor5-list/theme/liststyles.css b/packages/ckeditor5-list/theme/liststyles.css
@@ -6,39 +6,3 @@
 .ck.ck-list-styles-list {
 	display: grid;
 }
-
-.ck-content ol {
-	list-style-type: decimal;
-
-	& ol {
-		list-style-type: lower-latin;
-
-		& ol {
-			list-style-type: lower-roman;
-
-			& ol {
-				list-style-type: upper-latin;
-
-				& ol {
-					list-style-type: upper-roman;
-				}
-			}
-		}
-	}
-}
-
-.ck-content ul {
-	list-style-type: circle;
-
-	& ul {
-		list-style-type: disc;
-
-		& ul {
-			list-style-type: square;
-
-			& ul {
-				list-style-type: square;
-			}
-		}
-	}
-}