summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlex Pott2014-07-15 10:30:07 (GMT)
committerAlex Pott2014-07-15 10:30:07 (GMT)
commit16e60c421b49632d3ca65664a94b44bd20703dc1 (patch)
tree499cedc3150358779c276bbf86d20de4ce2354ac
parentc5b3010e7be8b7ded4980a2870c9c7abf914e45e (diff)
Issue #2033211 by LewisNyman, tim.plunkett, JamesLefrère | yannickoo: Move Seven CSS files into css directory.
-rw-r--r--core/modules/system/src/Tests/Menu/MenuRouterTest.php4
-rw-r--r--core/modules/taxonomy/src/Tests/ThemeTest.php4
-rw-r--r--core/tests/Drupal/Tests/Core/Extension/ThemeHandlerTest.php4
-rw-r--r--core/themes/seven/css/install-page.css (renamed from core/themes/seven/install-page.css)0
-rw-r--r--core/themes/seven/css/jquery.ui.theme.css (renamed from core/themes/seven/jquery.ui.theme.css)0
-rw-r--r--core/themes/seven/css/maintenance-page.css (renamed from core/themes/seven/maintenance-page.css)0
-rw-r--r--core/themes/seven/css/quickedit.css (renamed from core/themes/seven/quickedit.css)0
-rw-r--r--core/themes/seven/css/seven.base.css (renamed from core/themes/seven/seven.base.css)0
-rw-r--r--core/themes/seven/css/style.css (renamed from core/themes/seven/style.css)0
-rw-r--r--core/themes/seven/css/vertical-tabs.css (renamed from core/themes/seven/vertical-tabs.css)0
-rw-r--r--core/themes/seven/seven.info.yml10
-rw-r--r--core/themes/seven/seven.libraries.yml4
12 files changed, 13 insertions, 13 deletions
diff --git a/core/modules/system/src/Tests/Menu/MenuRouterTest.php b/core/modules/system/src/Tests/Menu/MenuRouterTest.php
index cc64d4b..26a0beb 100644
--- a/core/modules/system/src/Tests/Menu/MenuRouterTest.php
+++ b/core/modules/system/src/Tests/Menu/MenuRouterTest.php
@@ -392,7 +392,7 @@ class MenuRouterTest extends WebTestBase {
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 @@ class MenuRouterTest extends WebTestBase {
$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 218dd92..bdf9008 100644
--- a/core/modules/taxonomy/src/Tests/ThemeTest.php
+++ b/core/modules/taxonomy/src/Tests/ThemeTest.php
@@ -39,7 +39,7 @@ class ThemeTest extends TaxonomyTestBase {
// 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 @@ class ThemeTest extends TaxonomyTestBase {
// 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 4e6e06b..675d04e 100644
--- a/core/tests/Drupal/Tests/Core/Extension/ThemeHandlerTest.php
+++ b/core/tests/Drupal/Tests/Core/Extension/ThemeHandlerTest.php
@@ -156,8 +156,8 @@ class ThemeHandlerTest extends UnitTestCase {
// 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
index 8f04b3f..8f04b3f 100644
--- a/core/themes/seven/install-page.css
+++ b/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
index 4edb57a..4edb57a 100644
--- a/core/themes/seven/jquery.ui.theme.css
+++ b/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
index 8c6cc83..8c6cc83 100644
--- a/core/themes/seven/maintenance-page.css
+++ b/core/themes/seven/css/maintenance-page.css
diff --git a/core/themes/seven/quickedit.css b/core/themes/seven/css/quickedit.css
index 5172b60..5172b60 100644
--- a/core/themes/seven/quickedit.css
+++ b/core/themes/seven/css/quickedit.css
diff --git a/core/themes/seven/seven.base.css b/core/themes/seven/css/seven.base.css
index bff4d6a..bff4d6a 100644
--- a/core/themes/seven/seven.base.css
+++ b/core/themes/seven/css/seven.base.css
diff --git a/core/themes/seven/style.css b/core/themes/seven/css/style.css
index c17d61e..c17d61e 100644
--- a/core/themes/seven/style.css
+++ b/core/themes/seven/css/style.css
diff --git a/core/themes/seven/vertical-tabs.css b/core/themes/seven/css/vertical-tabs.css
index 325a3af..325a3af 100644
--- a/core/themes/seven/vertical-tabs.css
+++ b/core/themes/seven/css/vertical-tabs.css
diff --git a/core/themes/seven/seven.info.yml b/core/themes/seven/seven.info.yml
index 033edf1..9cf238f 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 fb22ac1..cc4efee 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