diff -u b/core/themes/bartik/color/color.inc b/core/themes/bartik/color/color.inc --- b/core/themes/bartik/color/color.inc +++ b/core/themes/bartik/color/color.inc @@ -102,11 +102,6 @@ 'css/colors.css', ), - // Files to copy. - 'copy' => array( - 'logo.svg', - ), - // Gradient definitions. 'gradients' => array( array( only in patch2: unchanged: --- a/core/modules/color/color.module +++ b/core/modules/color/color.module @@ -134,7 +134,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.png$!', $variables['logo'])) { + if ($logo && $variables['logo'] && preg_match('!' . $theme_key . '/logo.svg$!', $variables['logo'])) { $variables['logo'] = file_create_url($logo); } } @@ -451,10 +451,16 @@ function color_scheme_form_submit($form, FormStateInterface $form_state) { $paths['source'] = drupal_get_path('theme', $theme) . '/'; $paths['files'] = $paths['map'] = array(); - // Save palette and logo location. + // 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(); + } + + // Save palette. $config ->set('palette', $palette) - ->set('logo', $paths['target'] . 'logo.png') ->save(); // Copy over neutral images.