Issue #2541252 by HOG, finnsky, LewisNyman, nlisgo, saki007ster, alvar0hurtad0, maris.abols, pjbaert, bruvers, emma.maria, ti2m: Replace the .region-content ul/ol selector with text-formatted

5 files changed, 18 insertions, 14 deletions

diff --git a/core/modules/ckeditor/src/Tests/CKEditorTest.php b/core/modules/ckeditor/src/Tests/CKEditorTest.php
index baef0bec3819..6722393e67a1 100644
--- a/core/modules/ckeditor/src/Tests/CKEditorTest.php
+++ b/core/modules/ckeditor/src/Tests/CKEditorTest.php
@@ -270,6 +270,7 @@ class CKEditorTest extends KernelTestBase {
     $expected[] = file_create_url('core/themes/bartik/css/base/elements.css');
     $expected[] = file_create_url('core/themes/bartik/css/components/captions.css');
     $expected[] = file_create_url('core/themes/bartik/css/components/table.css');
+    $expected[] = file_create_url('core/themes/bartik/css/components/text-formatted.css');
     $this->assertIdentical($expected, $this->ckeditor->buildContentsCssJSSetting($editor), '"contentsCss" configuration part of JS settings built correctly while a theme providing a CKEditor stylesheet exists.');
   }
 
diff --git a/core/themes/bartik/bartik.info.yml b/core/themes/bartik/bartik.info.yml
index a74f90ce6358..c072de204616 100644
--- a/core/themes/bartik/bartik.info.yml
+++ b/core/themes/bartik/bartik.info.yml
@@ -11,6 +11,7 @@ ckeditor_stylesheets:
   - css/base/elements.css
   - css/components/captions.css
   - css/components/table.css
+  - css/components/text-formatted.css
 regions:
   header: Header
   primary_menu: 'Primary menu'
diff --git a/core/themes/bartik/bartik.libraries.yml b/core/themes/bartik/bartik.libraries.yml
index fd82367275d5..3bbecd932f68 100644
--- a/core/themes/bartik/bartik.libraries.yml
+++ b/core/themes/bartik/bartik.libraries.yml
@@ -44,6 +44,7 @@ global-styling:
       css/components/table.css: {}
       css/components/tablesort-indicator.css: {}
       css/components/tabs.css: {}
+      css/components/text-formatted.css: {}
       css/components/toolbar.css: {}
       css/components/featured-bottom.css: {}
       css/components/password-suggestions.css: {}
diff --git a/core/themes/bartik/css/components/main-content.css b/core/themes/bartik/css/components/main-content.css
index 2d178221dbd7..58f519095b11 100644
--- a/core/themes/bartik/css/components/main-content.css
+++ b/core/themes/bartik/css/components/main-content.css
@@ -49,17 +49,3 @@
   }
 }
 
-/**
- * @todo Decide if we want to keep this.
- * It should be in layout.css but it would be
- * overridden there by block.css.
- */
-.region-content ul,
-.region-content ol {
-  margin: 1em 0;
-  padding: 0 0 0.25em 15px; /* LTR */
-}
-[dir="rtl"] .region-content ul,
-[dir="rtl"] .region-content ol {
-  padding: 0 15px 0.25em 0;
-}
diff --git a/core/themes/bartik/css/components/text-formatted.css b/core/themes/bartik/css/components/text-formatted.css
new file mode 100644
index 000000000000..f302e7b89b29
--- /dev/null
+++ b/core/themes/bartik/css/components/text-formatted.css
@@ -0,0 +1,15 @@
+/**
+ * @file
+ *
+ * Visual styles for Bartik's text-formatted component.
+ */
+
+.text-formatted ul,
+.text-formatted ol {
+  margin: 1em 0;
+  padding: 0 0 0.25em 15px; /* LTR */
+}
+[dir="rtl"] .text-formatted ul,
+[dir="rtl"] .text-formatted ol {
+  padding: 0 15px 0.25em 0;
+}