diff --git a/split_system_css_files-2395853-28.patch b/split_system_css_files-2395853-32.patch index 43f272f..a92fe1a 100644 --- a/split_system_css_files-2395853-28.patch +++ b/split_system_css_files-2395853-32.patch @@ -1827,7 +1827,7 @@ index 0359e4b..f6f442c 100644 +++ b/core/modules/system/css/system.module.css @@ -4,37 +4,6 @@ */ - + /** - * Autocomplete. - * @@ -1869,7 +1869,7 @@ index 0f5b08f..507e3c7 100644 +++ b/core/modules/system/css/system.theme.css @@ -383,34 +383,6 @@ ul.links a.is-active { } - + /** - * Markup generated by breadcrumb.html.twig. - */ @@ -1905,7 +1905,7 @@ index 0f5b08f..507e3c7 100644 @@ -442,47 +414,6 @@ ul.tabs { background-color: #f5f5f5; } - + -/** - * Styles for link buttons and action links. - */ @@ -1947,9 +1947,38 @@ index 0f5b08f..507e3c7 100644 - padding-left: 0.2em; - padding-right: 0; -} - + /** * Styles for system messages. +diff --git a/core/modules/system/src/Tests/Theme/ThemeInfoTest.php b/core/modules/system/src/Tests/Theme/ThemeInfoTest.php +index 3d376ed..1213379 100644 +--- a/core/modules/system/src/Tests/Theme/ThemeInfoTest.php ++++ b/core/modules/system/src/Tests/Theme/ThemeInfoTest.php +@@ -71,16 +71,17 @@ function testStylesheets() { + // should work nevertheless. + $this->drupalGet('theme-test/info/stylesheets'); + +- $this->assertIdentical(1, count($this->xpath("//link[contains(@href, '$base/base-add.css')]")), "$base/base-add.css found"); +- $this->assertIdentical(0, count($this->xpath("//link[contains(@href, 'base-remove.css')]")), "base-remove.css not found"); ++ $this->assertIdentical(1, count($this->xpath('//style[contains(text(), :text)]', array(':text' => "$base/base-add.css"))), "$base/base-add.css found"); ++ $this->assertIdentical(0, count($this->xpath('//style[contains(text(), :text)]', array(':text' => "base-remove.css"))), "base-remove.css not found"); + +- $this->assertIdentical(1, count($this->xpath("//link[contains(@href, '$sub/sub-add.css')]")), "$sub/sub-add.css found"); +- $this->assertIdentical(0, count($this->xpath("//link[contains(@href, 'sub-remove.css')]")), "sub-remove.css not found"); +- $this->assertIdentical(0, count($this->xpath("//link[contains(@href, 'base-add.sub-remove.css')]")), "base-add.sub-remove.css not found"); ++ $this->assertIdentical(1, count($this->xpath('//style[contains(text(), :text)]', array(':text' => "$sub/sub-add.css"))), "$sub/sub-add.css found"); ++ $this->assertIdentical(0, count($this->xpath('//style[contains(text(), :text)]', array(':text' => "sub-remove.css"))), "sub-remove.css not found"); ++ $this->assertIdentical(0, count($this->xpath('//style[contains(text(), :text)]', array(':text' => "base-add.sub-remove.css"))), "base-add.sub-remove.css not found"); + + // Verify that CSS files with the same name are loaded from both the base theme and subtheme. +- $this->assertIdentical(1, count($this->xpath("//link[contains(@href, '$base/samename.css')]")), "$base/samename.css found"); +- $this->assertIdentical(1, count($this->xpath("//link[contains(@href, '$sub/samename.css')]")), "$sub/samename.css found"); ++ $this->assertIdentical(1, count($this->xpath('//style[contains(text(), :text)]', array(':text' => "$base/samename.css"))), "$base/samename.css found"); ++ $this->assertIdentical(1, count($this->xpath('//style[contains(text(), :text)]', array(':text' => "$sub/samename.css"))), "$sub/samename.css found"); ++ + } + + /** diff --git a/core/modules/system/system.libraries.yml b/core/modules/system/system.libraries.yml index 34c90dd..685c6a6 100644 --- a/core/modules/system/system.libraries.yml @@ -1987,7 +2016,7 @@ index 34c90dd..685c6a6 100644 + css/components/throbber.css: {} dependencies: - core/normalize - + @@ -13,7 +40,14 @@ admin: version: VERSION css: @@ -2003,4 +2032,4 @@ index 34c90dd..685c6a6 100644 + css/components/vertical-toolbar.css: {} dependencies: - system/base - +