Commit 23df3d55 authored by alexpott's avatar alexpott
Browse files

Issue #2472431 by davidhernandez, yannickoo, cilefen, LewisNyman: Do not load...

Issue #2472431 by davidhernandez, yannickoo, cilefen, LewisNyman: Do not load normalize.css in all themes, load it in Classy
parent d7ab90d9
......@@ -1462,7 +1462,6 @@ function template_preprocess_maintenance_page(&$variables) {
template_preprocess_page($variables);
// @see system_page_attachments()
$variables['#attached']['library'][] = 'core/normalize';
$variables['#attached']['library'][] = 'system/maintenance';
}
......
......@@ -94,13 +94,13 @@ public function testChanges() {
$active_theme = $this->themeManager->getActiveTheme();
// Make sure we are not testing the wrong theme.
$this->assertEqual('test_theme', $active_theme->getName());
$this->assertEqual(['classy/base', 'test_theme/global-styling'], $active_theme->getLibraries());
$this->assertEqual(['classy/base', 'core/normalize', 'test_theme/global-styling'], $active_theme->getLibraries());
// @see theme_test_system_info_alter()
$this->state->set('theme_test.modify_info_files', TRUE);
drupal_flush_all_caches();
$active_theme = $this->themeManager->getActiveTheme();
$this->assertEqual(['classy/base', 'test_theme/global-styling', 'core/backbone'], $active_theme->getLibraries());
$this->assertEqual(['classy/base', 'core/normalize', 'test_theme/global-styling', 'core/backbone'], $active_theme->getLibraries());
}
}
......@@ -6,8 +6,6 @@ base:
css/system.module.css: { every_page: true, weight: -10, }
theme:
css/system.theme.css: { every_page: true, weight: -10 }
dependencies:
- core/normalize
admin:
version: VERSION
......
......@@ -520,7 +520,6 @@ function system_filetransfer_info() {
*/
function system_page_attachments(array &$page) {
// Ensure the same CSS is loaded in template_preprocess_maintenance_page().
$page['#attached']['library'][] = 'core/normalize';
$page['#attached']['library'][] = 'system/base';
if (\Drupal::service('router.admin_context')->isAdminRoute()) {
$page['#attached']['library'][] = 'system/admin';
......
......@@ -7,3 +7,4 @@ core: 8.x
libraries:
- classy/base
- core/normalize
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