summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlex Pott2014-07-25 11:15:20 +0100
committerAlex Pott2014-07-25 11:17:35 +0100
commitf0c9d009a3369a6bbf4aa38736ff7258b53c4216 (patch)
tree9b29a2f946daa7eb243c5f81fce89bfcbf472de8
parentef50f952cbf6bb94c1faa9c441e3d0de3234c99d (diff)
Issue #2033211 by jwilson3, LewisNyman, sqndr, 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/dialog.theme.css4
-rw-r--r--core/themes/seven/css/install-page.css (renamed from core/themes/seven/install-page.css)8
-rw-r--r--core/themes/seven/css/jquery.ui.theme.css (renamed from core/themes/seven/jquery.ui.theme.css)14
-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)12
-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
13 files changed, 32 insertions, 32 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/css/dialog.theme.css b/core/themes/seven/css/dialog.theme.css
index 547ca7f..c3d766c 100644
--- a/core/themes/seven/css/dialog.theme.css
+++ b/core/themes/seven/css/dialog.theme.css
@@ -34,7 +34,7 @@
position: absolute;
}
.ui-dialog .ui-icon.ui-icon-closethick {
- background: url('../../../misc/icons/ffffff/ex.svg') 0 0 no-repeat;
+ background: url(../../../misc/icons/ffffff/ex.svg) 0 0 no-repeat;
margin-top: -12px;
}
.ui-dialog .ui-widget-content.ui-dialog-content {
@@ -77,7 +77,7 @@
top: 48.5%;
z-index: 1000;
background-color: #232323;
- background-image: url("../../../misc/loading-small.gif");
+ background-image: url(../../../misc/loading-small.gif);
background-position: center center;
background-repeat: no-repeat;
border-radius: 7px;
diff --git a/core/themes/seven/install-page.css b/core/themes/seven/css/install-page.css
index 444aeee..bb16549 100644
--- a/core/themes/seven/install-page.css
+++ b/core/themes/seven/css/install-page.css
@@ -8,16 +8,16 @@
.install-background {
background-color: #1275b2;
background-image:
- url('images/noise-low.png'),
+ url(../images/noise-low.png),
-webkit-radial-gradient(hsl(203, 80%, 45%), hsl(203, 80%, 32%));
background-image:
- url('images/noise-low.png'),
+ url(../images/noise-low.png),
-moz-radial-gradient(hsl(203, 80%, 45%), hsl(203, 80%, 32%));
background-image:
- url('images/noise-low.png'),
+ url(../images/noise-low.png),
-o-radial-gradient(hsl(203, 80%, 45%), hsl(203, 80%, 32%));
background-image:
- url('images/noise-low.png'),
+ url(../images/noise-low.png),
radial-gradient(hsl(203, 80%, 45%), hsl(203, 80%, 32%));
background-repeat: repeat;
background-position: left top, 50% 50%;
diff --git a/core/themes/seven/jquery.ui.theme.css b/core/themes/seven/css/jquery.ui.theme.css
index 4edb57a..8cfc67e 100644
--- a/core/themes/seven/jquery.ui.theme.css
+++ b/core/themes/seven/css/jquery.ui.theme.css
@@ -64,26 +64,26 @@
height: 16px;
overflow: hidden;
background-repeat: no-repeat;
- background-image: url(images/ui-icons-222222-256x240.png);
+ background-image: url(../images/ui-icons-222222-256x240.png);
}
.ui-widget-content .ui-icon,
.ui-widget-header .ui-icon {
- background-image: url(images/ui-icons-222222-256x240.png);
+ background-image: url(../images/ui-icons-222222-256x240.png);
}
.ui-state-default .ui-icon {
- background-image: url(images/ui-icons-888888-256x240.png);
+ background-image: url(../images/ui-icons-888888-256x240.png);
}
.ui-state-hover .ui-icon,
.ui-state-focus .ui-icon,
.ui-state-active .ui-icon {
- background-image: url(images/ui-icons-454545-256x240.png);
+ background-image: url(../images/ui-icons-454545-256x240.png);
}
.ui-state-highlight .ui-icon {
- background-image: url(images/ui-icons-800000-256x240.png);
+ background-image: url(../images/ui-icons-800000-256x240.png);
}
.ui-state-error .ui-icon,
.ui-state-error-text .ui-icon {
- background-image: url(images/ui-icons-ffffff-256x240.png);
+ background-image: url(../images/ui-icons-ffffff-256x240.png);
}
.ui-widget p .ui-icon {
margin: 2px 3px 0 0;
@@ -363,7 +363,7 @@
height: 1.4em;
}
.ui-progressbar .ui-progressbar-value {
- background: #0072b9 url(../../misc/progress.gif);
+ background: #0072b9 url(../../../misc/progress.gif);
height: 1.5em;
}
diff --git a/core/themes/seven/maintenance-page.css b/core/themes/seven/css/maintenance-page.css
index 213c134..213c134 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 460ef24..36b12c8 100644
--- a/core/themes/seven/style.css
+++ b/core/themes/seven/css/style.css
@@ -20,12 +20,12 @@ ul.menu li {
}
.item-list ul li.collapsed,
ul.menu li.collapsed {
- list-style-image: url(../../misc/menu-collapsed.png);
+ list-style-image: url(../../../misc/menu-collapsed.png);
list-style-type: disc;
}
.item-list ul li.expanded,
ul.menu li.expanded {
- list-style-image: url(../../misc/menu-expanded.png);
+ list-style-image: url(../../../misc/menu-expanded.png);
list-style-type: circle;
}
/**
@@ -224,10 +224,10 @@ li.tabs__tab a {
/* Only add the arrow if there's space */
@media screen and (min-width:18.75em) { /* 300px */
.tabs.primary a {
- background: url(../../misc/icons/0074bd/chevron-right.svg) 99% center no-repeat;
+ background: url(../../../misc/icons/0074bd/chevron-right.svg) 99% center no-repeat;
}
[dir="rtl"] .tabs.primary a {
- background: url(../../misc/icons/0074bd/chevron-left.svg) 1% center no-repeat;
+ background: url(../../../misc/icons/0074bd/chevron-left.svg) 1% center no-repeat;
}
.tabs.primary .tabs__tab.active a {
background-image: none;
@@ -441,13 +441,13 @@ ul.admin-list {
border: none;
}
.admin-list li a {
- background: url(../../misc/icons/bebebe/chevron-disc-right.svg) no-repeat 1px 16px; /* LTR */
+ background: url(../../../misc/icons/bebebe/chevron-disc-right.svg) no-repeat 1px 16px; /* LTR */
display: block;
padding: 14px 15px 14px 25px; /* LTR */
min-height: 0;
}
[dir="rtl"] .admin-list li a {
- background: url(../../misc/icons/bebebe/chevron-disc-left.svg) no-repeat right 16px;
+ background: url(../../../misc/icons/bebebe/chevron-disc-left.svg) no-repeat right 16px;
padding-right: 25px;
padding-left: 15px;
}
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