Issue #2064379 by tadityar, bneil: Remove ckeditor-iframe.css and load...

Issue #2064379 by tadityar, bneil: Remove ckeditor-iframe.css and load relevant Bartik CSS files for CKEditor's iframe mode

core/modules/ckeditor/src/Tests/CKEditorTest.php

@@ -265,7 +265,12 @@ function testBuildContentsCssJSSetting() {
     // Enable the Bartik theme, which specifies a CKEditor stylesheet.
     \Drupal::service('theme_handler')->install(['bartik']);
     $this->config('system.theme')->set('default', 'bartik')->save();
-    $expected[] = file_create_url('core/themes/bartik/css/ckeditor-iframe.css');
+    $expected[] = file_create_url('core/themes/bartik/css/base/elements.css');
+    $expected[] = file_create_url('core/themes/bartik/css/base/typography.css');
+    $expected[] = file_create_url('core/themes/bartik/css/components/captions.css');
+    $expected[] = file_create_url('core/themes/bartik/css/components/content.css');
+    $expected[] = file_create_url('core/themes/bartik/css/components/list.css');
+    $expected[] = file_create_url('core/themes/bartik/css/components/table.css');
     $this->assertIdentical($expected, $this->ckeditor->buildContentsCssJSSetting($editor), '"contentsCss" configuration part of JS settings built correctly while a theme providing a CKEditor stylesheet exists.');
   }
 

core/themes/bartik/bartik.info.yml

@@ -8,7 +8,12 @@ core: 8.x
 libraries:
   - bartik/global-styling
 ckeditor_stylesheets:
-  - css/ckeditor-iframe.css
+  - css/base/elements.css
+  - css/base/typography.css
+  - css/components/captions.css
+  - css/components/content.css
+  - css/components/list.css
+  - css/components/table.css
 regions:
   header: Header
   primary_menu: 'Primary menu'

core/themes/bartik/css/ckeditor-iframe.css

-/**
- * @file
- * Approximate Bartik's style in CKEditor instances on the Drupal back-end.
- */
-
-/* -------------- Captions -------------- */
-
-.caption > * {
-  background: #F3F3F3;
-  padding: 0.5ex;
-  border: 1px solid #CCC;
-}
-
-.caption > figcaption {
-  border: 1px solid #CCC;
-  border-top: none;
-  padding-top: 0.5ex;
-  font-size: small;
-  text-align: center;
-}
-
-/* Override Bartik's default blockquote and pre styles when captioned. */
-.caption-pre > pre,
-.caption-blockquote > blockquote {
-  margin: 0;
-}
-.caption-blockquote > figcaption::before {
-  content: "— ";
-}
-.caption-blockquote > figcaption {
-  text-align: left;
-}
-[dir="rtl"] .caption-blockquote > figcaption {
-  text-align: right;
-}