Commit ba82fc6c authored by alexpott's avatar alexpott

Issue #2541252 by HOG, finnsky, LewisNyman, nlisgo, saki007ster,...

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
parent 58bd5a3a
...@@ -270,6 +270,7 @@ function testBuildContentsCssJSSetting() { ...@@ -270,6 +270,7 @@ function testBuildContentsCssJSSetting() {
$expected[] = file_create_url('core/themes/bartik/css/base/elements.css'); $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/captions.css');
$expected[] = file_create_url('core/themes/bartik/css/components/table.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.'); $this->assertIdentical($expected, $this->ckeditor->buildContentsCssJSSetting($editor), '"contentsCss" configuration part of JS settings built correctly while a theme providing a CKEditor stylesheet exists.');
} }
......
...@@ -11,6 +11,7 @@ ckeditor_stylesheets: ...@@ -11,6 +11,7 @@ ckeditor_stylesheets:
- css/base/elements.css - css/base/elements.css
- css/components/captions.css - css/components/captions.css
- css/components/table.css - css/components/table.css
- css/components/text-formatted.css
regions: regions:
header: Header header: Header
primary_menu: 'Primary menu' primary_menu: 'Primary menu'
......
...@@ -44,6 +44,7 @@ global-styling: ...@@ -44,6 +44,7 @@ global-styling:
css/components/table.css: {} css/components/table.css: {}
css/components/tablesort-indicator.css: {} css/components/tablesort-indicator.css: {}
css/components/tabs.css: {} css/components/tabs.css: {}
css/components/text-formatted.css: {}
css/components/toolbar.css: {} css/components/toolbar.css: {}
css/components/featured-bottom.css: {} css/components/featured-bottom.css: {}
css/components/password-suggestions.css: {} css/components/password-suggestions.css: {}
......
...@@ -49,17 +49,3 @@ ...@@ -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;
}
/**
* @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;
}
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment