Verified Commit 73524b05 authored by Dave Long's avatar Dave Long
Browse files

task: #3604071 Change default to auto for light/dark mode 

By: jmstair
By: mherchel
By: mgifford
By: kentr
By: bernardm28
By: jurgenhaas
parent f7307570

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'

enable_dark_mode: '0'

enable_dark_mode: 'auto'

high_contrast_mode: false

accent_color: ''

focus_color: ''

core/themes/default_admin/src/Settings.php

+1 −1
Original line number Diff line number Diff line
@@ -227,9 +227,9 @@ public function getSettingsForm(?AccountInterface $account = NULL): array { 
      '#description' => $this->t('Enables dark mode for the administration interface.'),

      '#default_value' => (string) ($account ? $this->get('enable_dark_mode', $account) : $this->getDefault('enable_dark_mode')),

      '#options' => [

        'auto' => $this->t('Auto'),

        0 => $this->t('Light'),

        1 => $this->t('Dark'),

        'auto' => $this->t('Auto'),

      ],

    ];

core/themes/default_admin/tests/src/Functional/AdminTest.php

+4 −4
Original line number Diff line number Diff line
@@ -56,7 +56,7 @@ protected function setUp(): void { 
  public function testDefaultAdminSettings(): void {

    $response = $this->drupalGet('/admin/content');

    $this->assertSession()->statusCodeEquals(200);

    $this->assertStringContainsString('"dark_mode":"0"', $response);

    $this->assertStringContainsString('"dark_mode":"auto"', $response);

    $this->assertStringContainsString('"preset_accent_color":"blue"', $response);

    $this->assertStringContainsString('"preset_focus_color":"gin"', $response);

  }
@@ -101,7 +101,7 @@ public function testUserSettings(): void { 
    $this->drupalLogin($user1);



    // Change something on the logged in user form.

    $this->assertStringContainsString('"dark_mode":"0"', $this->drupalGet($user1->toUrl('edit-form')));

    $this->assertStringContainsString('"dark_mode":"auto"', $this->drupalGet($user1->toUrl('edit-form')));



    $this->submitForm([

      'enable_user_settings' => TRUE,
@@ -111,7 +111,7 @@ public function testUserSettings(): void { 


    // Login as admin.

    $this->drupalLogin($this->rootUser);

    $this->assertStringContainsString('"dark_mode":"0"', $this->drupalGet('edit-form'));

    $this->assertStringContainsString('"dark_mode":"auto"', $this->drupalGet('edit-form'));

  }



  /**
@@ -131,7 +131,7 @@ public function disabledTestUserSettings(): void { 
    // Check logged-in's user is not affected.

    $loggedInUserResponse = $this->drupalGet('edit-form');

    $this->assertStringContainsString('"high_contrast_mode":false', $loggedInUserResponse);

    $this->assertStringContainsString('"dark_mode":"0"', $loggedInUserResponse);

    $this->assertStringContainsString('"dark_mode":"auto"', $loggedInUserResponse);



    // Check settings of user1.

    $this->drupalLogin($user1);