Verified Commit 90701646 authored by Mike Herchel's avatar Mike Herchel
Browse files

task: #3623097 Remove remaining Gin and Claro implementation names from Default Admin theme, part 2 

By: godotislate
By: gábor hojtsy
By: jurgenhaas
By: mherchel
parent 254a60c7

core/themes/default_admin/config/install/default_admin.settings.yml

+1 −1
Original line number Diff line number Diff line 
preset_accent_color: 'blue'

preset_focus_color: 'gin'

preset_focus_color: 'default'

enable_dark_mode: 'auto'

high_contrast_mode: false

accent_color: ''

core/themes/default_admin/css/components/details.pcss.css

+1 −1
Original line number Diff line number Diff line
@@ -346,7 +346,7 @@ 
  margin-inline: 0.3em;

  content: "";

  vertical-align: super;

  background-image: url(../../images/core/ee0000/required.svg);

  background-image: url(../../images/icons/ee0000/required.svg);

  background-repeat: no-repeat;

  background-size: 0.4375rem 0.4375rem;

}

core/themes/default_admin/css/theme/accent.css

+1 −1
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ 
[data-admin-focus="green"] {

  --admin-color-focus: rgb(8, 163, 144, 0.6);

}

[data-admin-focus="claro"] {

[data-admin-focus="legacy_green"] {

  --admin-color-focus: rgb(38, 167, 105, 0.6);

}

[data-admin-focus="orange"] {

core/themes/default_admin/css/theme/accent.pcss.css

+1 −1
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ 
  --admin-color-focus: rgb(8, 163, 144, 0.6);

}



[data-admin-focus="claro"] {

[data-admin-focus="legacy_green"] {

  --admin-color-focus: rgb(38, 167, 105, 0.6);

}

core/themes/default_admin/default_admin.post_update.php

0 → 100644
+41 −0
Original line number Diff line number Diff line 
<?php



/**

 * @file

 * Post update functions for Default Admin.

 */



/**

 * Renames legacy focus color preset values in theme and user settings.

 */

function default_admin_post_update_rename_focus_color_presets(): void {

  $renamed = [

    'gin' => 'default',

    'claro' => 'legacy_green',

  ];



  $config = \Drupal::configFactory()->getEditable('default_admin.settings');

  $preset = $config->get('preset_focus_color');

  if (is_string($preset) && isset($renamed[$preset])) {

    $config->set('preset_focus_color', $renamed[$preset])->save();

  }



  if (!\Drupal::hasService('user.data')) {

    return;

  }

  /** @var \Drupal\user\UserDataInterface $user_data */

  $user_data = \Drupal::service('user.data');

  foreach ($user_data->get('default_admin') as $uid => $data) {

    // User overrides are stored as one array under the 'settings' key.

    $preset = $data['settings']['preset_focus_color'] ?? NULL;

    if (is_string($preset) && isset($renamed[$preset])) {

      $data['settings']['preset_focus_color'] = $renamed[$preset];

      $user_data->set('default_admin', $uid, 'settings', $data['settings']);

    }

    // Older overrides were stored under one key per setting.

    $preset = $data['preset_focus_color'] ?? NULL;

    if (is_string($preset) && isset($renamed[$preset])) {

      $user_data->set('default_admin', $uid, 'preset_focus_color', $renamed[$preset]);

    }

  }

}