diff --git a/core/includes/theme.inc b/core/includes/theme.inc index 1277d5b..45971cf 100644 --- a/core/includes/theme.inc +++ b/core/includes/theme.inc @@ -379,12 +379,7 @@ function theme_get_setting($setting_name, $theme = NULL) { if ($cache[$theme]->get('features.logo')) { $logo_path = $cache[$theme]->get('logo.path'); if ($cache[$theme]->get('logo.use_default')) { - if (file_exists($logo_svg = $theme_object->getPath() . '/logo.svg')) { - $cache[$theme]->set('logo.url', file_create_url($logo_svg)); - } - else { - $cache[$theme]->set('logo.url', file_create_url($theme_object->getPath() . '/logo.png')); - } + $cache[$theme]->set('logo.url', file_create_url($logo_svg)); } elseif ($logo_path) { $cache[$theme]->set('logo.url', file_create_url($logo_path)); diff --git a/core/modules/color/color.module b/core/modules/color/color.module index 1891c8d..7b3d114 100644 --- a/core/modules/color/color.module +++ b/core/modules/color/color.module @@ -115,7 +115,7 @@ function color_preprocess_page(&$variables) { // Override logo. $logo = \Drupal::config('color.theme.' . $theme_key)->get('logo'); - if ($logo && $variables['logo'] && preg_match('!' . $theme_key . '/logo.(svg|png)$!', $variables['logo'])) { + if ($logo && $variables['logo'] && preg_match('!' . $theme_key . '/logo.svg$!', $variables['logo'])) { $variables['logo'] = file_create_url($logo); } } @@ -424,14 +424,10 @@ function color_scheme_form_submit($form, FormStateInterface $form_state) { $paths['source'] = drupal_get_path('theme', $theme) . '/'; $paths['files'] = $paths['map'] = array(); - // Save logo location only if logo.png is provided. - if (isset($info['copy']) && in_array('logo.png', $info['copy'])) { - $config->set('logo', $paths['target'] . 'logo.png'); - } - - // Save palette. + // Save palette and logo location. $config ->set('palette', $palette) + ->set('logo', $paths['target'] . 'logo.svg') ->save(); // Copy over neutral images. diff --git a/core/themes/bartik/color/color.inc b/core/themes/bartik/color/color.inc index 602f1b9..0ef14f9 100644 --- a/core/themes/bartik/color/color.inc +++ b/core/themes/bartik/color/color.inc @@ -101,6 +101,11 @@ 'css/colors.css', ), + // Files to copy. + 'copy' => array( + 'logo.svg', + ), + // Gradient definitions. 'gradients' => array( array(