summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlex Pott2014-10-08 08:01:42 (GMT)
committerAlex Pott2014-10-08 08:01:42 (GMT)
commit539ff3055cfc18eb51ea53cef276485661cbffea (patch)
tree23acca8c18092ce85f491d7fe9e509c2e270ea70
parentdf20c166d9ce71eaaca925c17db4768178647918 (diff)
Issue #2337379 by skippednote, BarisW, derjochenmeyer, herom, ChandeepKhosa, kiliweb, sqndr, Palashvijay4 | LewisNyman: Rename 'branding' to 'content-header'.
-rw-r--r--core/tests/Drupal/Tests/Core/Extension/ThemeHandlerTest.php2
-rw-r--r--core/themes/seven/css/components/content-header.css (renamed from core/themes/seven/css/components/branding.css)4
-rw-r--r--core/themes/seven/css/components/page-title.css2
-rw-r--r--core/themes/seven/css/components/tabs.css4
-rw-r--r--core/themes/seven/seven.info.yml2
-rw-r--r--core/themes/seven/templates/page.html.twig2
6 files changed, 8 insertions, 8 deletions
diff --git a/core/tests/Drupal/Tests/Core/Extension/ThemeHandlerTest.php b/core/tests/Drupal/Tests/Core/Extension/ThemeHandlerTest.php
index 3d89abe..547c953 100644
--- a/core/tests/Drupal/Tests/Core/Extension/ThemeHandlerTest.php
+++ b/core/tests/Drupal/Tests/Core/Extension/ThemeHandlerTest.php
@@ -180,7 +180,7 @@ class ThemeHandlerTest extends UnitTestCase {
'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
index 90d2ae8..962688a 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 aed5ca8..664bbd1 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 fe8d8fc..6f437fb 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 2357e5e..5ef8ed1 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 1a13268..c5ffc5c 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
*/
#}
- <header id="branding" class="clearfix">
+ <header class="content-header clearfix">
<div class="layout-container">
{{ title_prefix }}
{% if title %}