Commit 16e60c42 authored by alexpott's avatar alexpott

Issue #2033211 by LewisNyman, tim.plunkett, JamesLefrère | yannickoo: Move...

Issue #2033211 by LewisNyman, tim.plunkett, JamesLefrère | yannickoo: Move Seven CSS files into css directory.
parent c5b3010e
...@@ -392,7 +392,7 @@ public function testThemeIntegration() { ...@@ -392,7 +392,7 @@ public function testThemeIntegration() {
protected function doTestThemeCallbackAdministrative() { protected function doTestThemeCallbackAdministrative() {
$this->drupalGet('menu-test/theme-callback/use-admin-theme'); $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->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() { ...@@ -411,7 +411,7 @@ protected function doTestThemeCallbackMaintenanceMode() {
$this->drupalLogin($admin_user); $this->drupalLogin($admin_user);
$this->drupalGet('menu-test/theme-callback/use-admin-theme'); $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->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); $this->container->get('state')->set('system.maintenance_mode', FALSE);
} }
......
...@@ -39,7 +39,7 @@ function testTaxonomyTermThemes() { ...@@ -39,7 +39,7 @@ function testTaxonomyTermThemes() {
// should use the administrative theme. // should use the administrative theme.
$vocabulary = $this->createVocabulary(); $vocabulary = $this->createVocabulary();
$this->drupalGet('admin/structure/taxonomy/manage/' . $vocabulary->id() . '/add'); $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. // Viewing a taxonomy term should use the default theme.
$term = $this->createTerm($vocabulary); $term = $this->createTerm($vocabulary);
...@@ -48,6 +48,6 @@ function testTaxonomyTermThemes() { ...@@ -48,6 +48,6 @@ function testTaxonomyTermThemes() {
// Editing a taxonomy term should use the same theme as adding one. // Editing a taxonomy term should use the same theme as adding one.
$this->drupalGet('taxonomy/term/' . $term->id() . '/edit'); $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."));
} }
} }
...@@ -156,8 +156,8 @@ public function testRebuildThemeData() { ...@@ -156,8 +156,8 @@ public function testRebuildThemeData() {
// Ensure that the css paths are set with the proper prefix. // Ensure that the css paths are set with the proper prefix.
$this->assertEquals(array( $this->assertEquals(array(
'screen' => array( 'screen' => array(
'seven.base.css' => DRUPAL_ROOT . '/core/themes/seven/seven.base.css', 'css/seven.base.css' => DRUPAL_ROOT . '/core/themes/seven/css/seven.base.css',
'style.css' => DRUPAL_ROOT . '/core/themes/seven/style.css', 'css/style.css' => DRUPAL_ROOT . '/core/themes/seven/css/style.css',
'css/layout.css' => DRUPAL_ROOT . '/core/themes/seven/css/layout.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.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', 'css/components/buttons.theme.css' => DRUPAL_ROOT . '/core/themes/seven/css/components/buttons.theme.css',
......
...@@ -8,21 +8,21 @@ version: VERSION ...@@ -8,21 +8,21 @@ version: VERSION
core: 8.x core: 8.x
stylesheets: stylesheets:
screen: screen:
- seven.base.css - css/seven.base.css
- style.css - css/style.css
- css/layout.css - css/layout.css
- css/components/buttons.css - css/components/buttons.css
- css/components/buttons.theme.css - css/components/buttons.theme.css
- css/components/dropbutton.component.css - css/components/dropbutton.component.css
- css/components/tour.theme.css - css/components/tour.theme.css
stylesheets-override: stylesheets-override:
- vertical-tabs.css - css/vertical-tabs.css
- jquery.ui.theme.css - css/jquery.ui.theme.css
- css/dialog.theme.css - css/dialog.theme.css
stylesheets-remove: stylesheets-remove:
- jquery.ui.dialog.css - jquery.ui.dialog.css
quickedit_stylesheets: quickedit_stylesheets:
- quickedit.css - css/quickedit.css
regions: regions:
content: Content content: Content
help: Help help: Help
......
...@@ -4,7 +4,7 @@ maintenance-page: ...@@ -4,7 +4,7 @@ maintenance-page:
js/mobile.install.js: {} js/mobile.install.js: {}
css: css:
theme: theme:
maintenance-page.css: {} css/maintenance-page.css: {}
dependencies: dependencies:
- system/maintenance - system/maintenance
...@@ -14,7 +14,7 @@ install-page: ...@@ -14,7 +14,7 @@ install-page:
js/mobile.install.js: {} js/mobile.install.js: {}
css: css:
theme: theme:
install-page.css: {} css/install-page.css: {}
dependencies: dependencies:
- system/maintenance - system/maintenance
......
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