diff --git a/core/tests/Drupal/Tests/Core/Extension/ThemeHandlerTest.php b/core/tests/Drupal/Tests/Core/Extension/ThemeHandlerTest.php index 3d89abe5031fdac7a035102fbb67a30e061cc54d..547c953021740a33c9accbbaa934d66a08d7c141 100644 --- a/core/tests/Drupal/Tests/Core/Extension/ThemeHandlerTest.php +++ b/core/tests/Drupal/Tests/Core/Extension/ThemeHandlerTest.php @@ -180,7 +180,7 @@ public function testRebuildThemeData() { 'css/components/admin-options.css' => DRUPAL_ROOT . '/core/themes/seven/css/components/admin-options.css', 'css/components/admin-panel.css' => DRUPAL_ROOT . '/core/themes/seven/css/components/admin-panel.css', 'css/components/block-recent-content.css' => DRUPAL_ROOT . '/core/themes/seven/css/components/block-recent-content.css', - 'css/components/branding.css' => DRUPAL_ROOT . '/core/themes/seven/css/components/branding.css', + 'css/components/content-header.css' => DRUPAL_ROOT . '/core/themes/seven/css/components/content-header.css', 'css/components/breadcrumb.css' => DRUPAL_ROOT . '/core/themes/seven/css/components/breadcrumb.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/components/branding.css b/core/themes/seven/css/components/content-header.css similarity index 68% rename from core/themes/seven/css/components/branding.css rename to core/themes/seven/css/components/content-header.css index 90d2ae866ae2751c1ec1d9243450eb4b20f3d2d7..962688a38ae116561a7b4cbcc09cfa0bd3a50f07 100644 --- a/core/themes/seven/css/components/branding.css +++ b/core/themes/seven/css/components/content-header.css @@ -1,7 +1,7 @@ /** - * Branding. + * Content header. */ -#branding { +.content-header { overflow: hidden; background-color: #e0e0d8; padding: 24px 0 0; diff --git a/core/themes/seven/css/components/page-title.css b/core/themes/seven/css/components/page-title.css index aed5ca833ff993dc31267e4bd0d546ae63eeea17..664bbd1eb7ccd6b4fbbfdac1719117183668c3a1 100644 --- a/core/themes/seven/css/components/page-title.css +++ b/core/themes/seven/css/components/page-title.css @@ -4,7 +4,7 @@ #page-title { padding-top: 20px; } -#branding .page-title { +.content-header .page-title { color: #333; display: inline-block; margin: 0; diff --git a/core/themes/seven/css/components/tabs.css b/core/themes/seven/css/components/tabs.css index fe8d8fc945300ec3958ac2b8eef438a539666f70..6f437fbfd60253e532398006f3f7ba3241e26f77 100644 --- a/core/themes/seven/css/components/tabs.css +++ b/core/themes/seven/css/components/tabs.css @@ -19,8 +19,8 @@ } /* Span the full width of the viewport */ -#branding .is-horizontal .tabs:before, -#branding .is-collapse-enabled .tabs:before { +.content-header .is-horizontal .tabs:before, +.content-header .is-collapse-enabled .tabs:before { left: -2.5em; right: -2.5em; } diff --git a/core/themes/seven/seven.info.yml b/core/themes/seven/seven.info.yml index 2357e5e93661fcf0bc3df8f56b3d0816dd11eb7f..5ef8ed1b84010dd808a72582e80aae8cc3f95dc9 100644 --- a/core/themes/seven/seven.info.yml +++ b/core/themes/seven/seven.info.yml @@ -14,7 +14,7 @@ stylesheets: - css/components/admin-options.css - css/components/admin-panel.css - css/components/block-recent-content.css - - css/components/branding.css + - css/components/content-header.css - css/components/breadcrumb.css - css/components/buttons.css - css/components/buttons.theme.css diff --git a/core/themes/seven/templates/page.html.twig b/core/themes/seven/templates/page.html.twig index 1a13268cf6528006561ce4bbf518bb4c4268a3ee..c5ffc5cd112d25a0a91575cb0a8b3b7ba986b902 100644 --- a/core/themes/seven/templates/page.html.twig +++ b/core/themes/seven/templates/page.html.twig @@ -60,7 +60,7 @@ * @see html.html.twig */ #} -
+
{{ title_prefix }} {% if title %}