diff --git a/core/includes/theme.inc b/core/includes/theme.inc index 7400017..b7b3b53 100644 --- a/core/includes/theme.inc +++ b/core/includes/theme.inc @@ -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'; } diff --git a/core/modules/system/src/Tests/Theme/ThemeInfoTest.php b/core/modules/system/src/Tests/Theme/ThemeInfoTest.php index 0b38ea7..595e8d9 100644 --- a/core/modules/system/src/Tests/Theme/ThemeInfoTest.php +++ b/core/modules/system/src/Tests/Theme/ThemeInfoTest.php @@ -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', 'classy/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', 'classy/normalize', 'test_theme/global-styling', 'core/backbone'], $active_theme->getLibraries()); } } diff --git a/core/modules/system/system.libraries.yml b/core/modules/system/system.libraries.yml index b440e15..43113de 100644 --- a/core/modules/system/system.libraries.yml +++ b/core/modules/system/system.libraries.yml @@ -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 diff --git a/core/modules/system/system.module b/core/modules/system/system.module index 732e27b..26ee0e8 100644 --- a/core/modules/system/system.module +++ b/core/modules/system/system.module @@ -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'; diff --git a/core/themes/classy/classy.info.yml b/core/themes/classy/classy.info.yml index 93a5268..bd61ce0 100644 --- a/core/themes/classy/classy.info.yml +++ b/core/themes/classy/classy.info.yml @@ -7,3 +7,4 @@ core: 8.x libraries: - classy/base + - core/normalize