Merge pull request #2215 from tf/justified-center-ragged-list-2

tf · web-flow · commit d9877b6fa5ee · 2025-03-26T17:28:59.000+01:00
Fix display of justified lists in center ragged lists in editor
diff --git a/entry_types/scrolled/package/src/contentElements/textBlock/TextBlock.module.css b/entry_types/scrolled/package/src/contentElements/textBlock/TextBlock.module.css
@@ -120,6 +120,7 @@
   text-align: center;
 }
 
-.layout-centerRagged {
-  --editable-text-list-style-position: inside;
+.layout-centerRagged ol,
+.layout-centerRagged ul {
+  list-style-position: inside;
 }
diff --git a/entry_types/scrolled/package/src/frontend/EditableText.module.css b/entry_types/scrolled/package/src/frontend/EditableText.module.css
@@ -8,18 +8,14 @@
   white-space: pre-line;
 }
 
-.root ul,
-.root ol {
-  list-style-position: var(--editable-text-list-style-position);
-}
-
 .justify {
   text-align: justify;
 }
 
 ul.justify,
 ol.justify {
-  list-style-position: outside;
+  /* Override style set by center-ragged text block */
+  list-style-position: outside !important;
 }
 
 .light {

Original file line number	Diff line number	Diff line change
`@@ -120,6 +120,7 @@`
`120`	`120`	`text-align: center;`
`121`	`121`	`}`
`122`	`122`
`123`		`-.layout-centerRagged {`
`124`		`- --editable-text-list-style-position: inside;`
	`123`	`+.layout-centerRagged ol,`
	`124`	`+.layout-centerRagged ul {`
	`125`	`+ list-style-position: inside;`
`125`	`126`	`}`
Original file line number	Diff line number	Diff line change
`@@ -8,18 +8,14 @@`
`8`	`8`	`white-space: pre-line;`
`9`	`9`	`}`
`10`	`10`
`11`		`-.root ul,`
`12`		`-.root ol {`
`13`		`- list-style-position: var(--editable-text-list-style-position);`
`14`		`-}`
`15`		`-`
`16`	`11`	`.justify {`
`17`	`12`	`text-align: justify;`
`18`	`13`	`}`
`19`	`14`
`20`	`15`	`ul.justify,`
`21`	`16`	`ol.justify {`
`22`		`- list-style-position: outside;`
	`17`	`+ /* Override style set by center-ragged text block */`
	`18`	`+ list-style-position: outside !important;`
`23`	`19`	`}`
`24`	`20`
`25`	`21`	`.light {`