diff --git a/core/config/schema/core.data_types.schema.yml b/core/config/schema/core.data_types.schema.yml
index 0667c77..8230d3e 100644
--- a/core/config/schema/core.data_types.schema.yml
+++ b/core/config/schema/core.data_types.schema.yml
@@ -208,10 +208,10 @@ theme_settings:
type: boolean
label: 'Use default'
alt:
- type: string
+ type: label
label: 'Logo alternative text'
title:
- type: string
+ type: label
label: 'Logo title'
third_party_settings:
type: sequence
diff --git a/core/modules/system/src/Plugin/Block/SystemBrandingBlock.php b/core/modules/system/src/Plugin/Block/SystemBrandingBlock.php
index 5f09d1c..7c9c99e 100644
--- a/core/modules/system/src/Plugin/Block/SystemBrandingBlock.php
+++ b/core/modules/system/src/Plugin/Block/SystemBrandingBlock.php
@@ -156,8 +156,8 @@ public function build() {
$build['site_logo'] = [
'#theme' => 'image',
'#uri' => theme_get_setting('logo.url'),
- '#alt' => theme_get_setting('logo.alt') ?: $this->t('Home'),
- '#title' => theme_get_setting('logo.title') ?: '',
+ '#alt' => theme_get_setting('logo.alt'),
+ '#title' => theme_get_setting('logo.title'),
'#access' => $this->configuration['use_site_logo'],
];
diff --git a/core/modules/system/system.install b/core/modules/system/system.install
index 614ad9e..afc627e 100644
--- a/core/modules/system/system.install
+++ b/core/modules/system/system.install
@@ -1927,3 +1927,23 @@ function system_update_8400(&$sandbox) {
$sandbox['#finished'] = $sandbox['current'] == $sandbox['max'];
}
+
+/**
+ * Set the default Logo alt and title.
+ */
+function system_update_8302() {
+ // Set the values for the global theme settings.
+ \Drupal::configFactory()->getEditable('system.theme.global')
+ ->set('logo.alt', 'Home')
+ ->set('logo.title', 'Home')
+ ->save(TRUE);
+
+ // Set the values for all currently installed themes.
+ $theme_handler = \Drupal::service('theme_handler');
+ foreach ($theme_handler->listInfo() as $theme) {
+ \Drupal::configFactory()->getEditable($theme->getName() . '.settings')
+ ->set('logo.alt', 'Home')
+ ->set('logo.title', 'Home')
+ ->save(TRUE);
+ }
+}
diff --git a/core/modules/system/templates/block--system-branding-block.html.twig b/core/modules/system/templates/block--system-branding-block.html.twig
index 0c7a7cb..bb1fb4f 100644
--- a/core/modules/system/templates/block--system-branding-block.html.twig
+++ b/core/modules/system/templates/block--system-branding-block.html.twig
@@ -19,12 +19,12 @@
#}
{% block content %}
{% if site_logo %}
-
-
+
+
{% endif %}
{% if site_name %}
- {{ site_name }}
+ {{ site_name }}
{% endif %}
{{ site_slogan }}
{% endblock %}
diff --git a/core/themes/bartik/templates/block--system-branding-block.html.twig b/core/themes/bartik/templates/block--system-branding-block.html.twig
index d85b36f..7b40070 100644
--- a/core/themes/bartik/templates/block--system-branding-block.html.twig
+++ b/core/themes/bartik/templates/block--system-branding-block.html.twig
@@ -18,15 +18,15 @@
{% set attributes = attributes.addClass('site-branding') %}
{% block content %}
{% if site_logo %}
-
-
+
+
{% endif %}
{% if site_name or site_slogan %}