diff --git a/core/modules/system/src/Tests/Menu/MenuRouterTest.php b/core/modules/system/src/Tests/Menu/MenuRouterTest.php index cc64d4b2290489716c8d07760d9cb54e80cac0ec..26a0beb848af83b45d03d963a90671f7e1fdbffd 100644 --- a/core/modules/system/src/Tests/Menu/MenuRouterTest.php +++ b/core/modules/system/src/Tests/Menu/MenuRouterTest.php @@ -392,7 +392,7 @@ public function testThemeIntegration() { protected function doTestThemeCallbackAdministrative() { $this->drupalGet('menu-test/theme-callback/use-admin-theme'); $this->assertText('Active theme: seven. Actual theme: seven.', 'The administrative theme can be correctly set in a theme negotiation.'); - $this->assertRaw('seven/style.css', "The administrative theme's CSS appears on the page."); + $this->assertRaw('seven/css/style.css', "The administrative theme's CSS appears on the page."); } /** @@ -411,7 +411,7 @@ protected function doTestThemeCallbackMaintenanceMode() { $this->drupalLogin($admin_user); $this->drupalGet('menu-test/theme-callback/use-admin-theme'); $this->assertText('Active theme: seven. Actual theme: seven.', 'The theme negotiation system is correctly triggered for an administrator when the site is in maintenance mode.'); - $this->assertRaw('seven/style.css', "The administrative theme's CSS appears on the page."); + $this->assertRaw('seven/css/style.css', "The administrative theme's CSS appears on the page."); $this->container->get('state')->set('system.maintenance_mode', FALSE); } diff --git a/core/modules/taxonomy/src/Tests/ThemeTest.php b/core/modules/taxonomy/src/Tests/ThemeTest.php index 218dd9223d167fcda3b453fb3975faa4c929d332..bdf90086619a4c327e29d3cd43027868dd8e3418 100644 --- a/core/modules/taxonomy/src/Tests/ThemeTest.php +++ b/core/modules/taxonomy/src/Tests/ThemeTest.php @@ -39,7 +39,7 @@ function testTaxonomyTermThemes() { // should use the administrative theme. $vocabulary = $this->createVocabulary(); $this->drupalGet('admin/structure/taxonomy/manage/' . $vocabulary->id() . '/add'); - $this->assertRaw('seven/style.css', t("The administrative theme's CSS appears on the page for adding a taxonomy term.")); + $this->assertRaw('seven/css/style.css', t("The administrative theme's CSS appears on the page for adding a taxonomy term.")); // Viewing a taxonomy term should use the default theme. $term = $this->createTerm($vocabulary); @@ -48,6 +48,6 @@ function testTaxonomyTermThemes() { // Editing a taxonomy term should use the same theme as adding one. $this->drupalGet('taxonomy/term/' . $term->id() . '/edit'); - $this->assertRaw('seven/style.css', t("The administrative theme's CSS appears on the page for editing a taxonomy term.")); + $this->assertRaw('seven/css/style.css', t("The administrative theme's CSS appears on the page for editing a taxonomy term.")); } } diff --git a/core/tests/Drupal/Tests/Core/Extension/ThemeHandlerTest.php b/core/tests/Drupal/Tests/Core/Extension/ThemeHandlerTest.php index 4e6e06b74c5d448eaaaf9fe72e539c7ebd3d7e74..675d04ede3cf02ddd0150338a013ca10e71ae766 100644 --- a/core/tests/Drupal/Tests/Core/Extension/ThemeHandlerTest.php +++ b/core/tests/Drupal/Tests/Core/Extension/ThemeHandlerTest.php @@ -156,8 +156,8 @@ public function testRebuildThemeData() { // Ensure that the css paths are set with the proper prefix. $this->assertEquals(array( 'screen' => array( - 'seven.base.css' => DRUPAL_ROOT . '/core/themes/seven/seven.base.css', - 'style.css' => DRUPAL_ROOT . '/core/themes/seven/style.css', + 'css/seven.base.css' => DRUPAL_ROOT . '/core/themes/seven/css/seven.base.css', + 'css/style.css' => DRUPAL_ROOT . '/core/themes/seven/css/style.css', 'css/layout.css' => DRUPAL_ROOT . '/core/themes/seven/css/layout.css', 'css/components/buttons.css' => DRUPAL_ROOT . '/core/themes/seven/css/components/buttons.css', 'css/components/buttons.theme.css' => DRUPAL_ROOT . '/core/themes/seven/css/components/buttons.theme.css', diff --git a/core/themes/seven/install-page.css b/core/themes/seven/css/install-page.css similarity index 100% rename from core/themes/seven/install-page.css rename to core/themes/seven/css/install-page.css diff --git a/core/themes/seven/jquery.ui.theme.css b/core/themes/seven/css/jquery.ui.theme.css similarity index 100% rename from core/themes/seven/jquery.ui.theme.css rename to core/themes/seven/css/jquery.ui.theme.css diff --git a/core/themes/seven/maintenance-page.css b/core/themes/seven/css/maintenance-page.css similarity index 100% rename from core/themes/seven/maintenance-page.css rename to core/themes/seven/css/maintenance-page.css diff --git a/core/themes/seven/quickedit.css b/core/themes/seven/css/quickedit.css similarity index 100% rename from core/themes/seven/quickedit.css rename to core/themes/seven/css/quickedit.css diff --git a/core/themes/seven/seven.base.css b/core/themes/seven/css/seven.base.css similarity index 100% rename from core/themes/seven/seven.base.css rename to core/themes/seven/css/seven.base.css diff --git a/core/themes/seven/style.css b/core/themes/seven/css/style.css similarity index 100% rename from core/themes/seven/style.css rename to core/themes/seven/css/style.css diff --git a/core/themes/seven/vertical-tabs.css b/core/themes/seven/css/vertical-tabs.css similarity index 100% rename from core/themes/seven/vertical-tabs.css rename to core/themes/seven/css/vertical-tabs.css diff --git a/core/themes/seven/seven.info.yml b/core/themes/seven/seven.info.yml index 033edf11d6dd306724d0f2876a67b10007784012..9cf238f6c739581e85f92450d58ab0a3c31b055a 100644 --- a/core/themes/seven/seven.info.yml +++ b/core/themes/seven/seven.info.yml @@ -8,21 +8,21 @@ version: VERSION core: 8.x stylesheets: screen: - - seven.base.css - - style.css + - css/seven.base.css + - css/style.css - css/layout.css - css/components/buttons.css - css/components/buttons.theme.css - css/components/dropbutton.component.css - css/components/tour.theme.css stylesheets-override: - - vertical-tabs.css - - jquery.ui.theme.css + - css/vertical-tabs.css + - css/jquery.ui.theme.css - css/dialog.theme.css stylesheets-remove: - jquery.ui.dialog.css quickedit_stylesheets: - - quickedit.css + - css/quickedit.css regions: content: Content help: Help diff --git a/core/themes/seven/seven.libraries.yml b/core/themes/seven/seven.libraries.yml index fb22ac1287a4147a06f2c6e049fc9b33627c93f8..cc4efee5eedf087a8274115c4018c9e4999aad8c 100644 --- a/core/themes/seven/seven.libraries.yml +++ b/core/themes/seven/seven.libraries.yml @@ -4,7 +4,7 @@ maintenance-page: js/mobile.install.js: {} css: theme: - maintenance-page.css: {} + css/maintenance-page.css: {} dependencies: - system/maintenance @@ -14,7 +14,7 @@ install-page: js/mobile.install.js: {} css: theme: - install-page.css: {} + css/install-page.css: {} dependencies: - system/maintenance