Issue #2033211 by jwilson3, LewisNyman, sqndr, tim.plunkett, JamesLefrère |...

Issue #2033211 by jwilson3, LewisNyman, sqndr, tim.plunkett, JamesLefrère | yannickoo: Move Seven CSS files into css directory.

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);
   }

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."));
   }
 }

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',

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;

core/themes/seven/install-page.css → 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%;

core/themes/seven/jquery.ui.theme.css → 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;
 }
 

core/themes/seven/style.css → 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;
 }

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

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