Skip to content

[stable25] fix highcontrast theme #34317

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
blizzz merged 1 commit into from
Sep 28, 2022
Merged

[stable25] fix highcontrast theme #34317

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion apps/theming/lib/Themes/HighContrastTheme.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
class HighContrastTheme extends DefaultTheme implements ITheme {

public function getId(): string {
return 'highcontrast';
return 'light-highcontrast';
}

public function getMediaQuery(): string {
Expand Down
4 changes: 2 additions & 2 deletions apps/theming/tests/Controller/UserThemeControllerTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ protected function setUp(): void {
'default' => $this->createMock(DefaultTheme::class),
'light' => $this->createMock(LightTheme::class),
'dark' => $this->createMock(DarkTheme::class),
'highcontrast' => $this->createMock(HighContrastTheme::class),
'light-highcontrast' => $this->createMock(HighContrastTheme::class),
'dark-highcontrast' => $this->createMock(DarkHighContrastTheme::class),
'opendyslexic' => $this->createMock(DyslexiaFont::class),
];
Expand Down Expand Up @@ -102,7 +102,7 @@ public function dataTestThemes() {
['default'],
['light'],
['dark'],
['highcontrast'],
['light-highcontrast'],
['dark-highcontrast'],
['opendyslexic'],
['', OCSBadRequestException::class],
Expand Down
10 changes: 5 additions & 5 deletions apps/theming/tests/Service/ThemesServiceTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ public function testGetThemes() {
'default',
'light',
'dark',
'highcontrast',
'light-highcontrast',
'dark-highcontrast',
'opendyslexic',
];
Expand All @@ -98,7 +98,7 @@ public function dataTestEnableTheme() {
['dark', [], ['dark']],
['dark', ['dark'], ['dark']],
['opendyslexic', ['dark'], ['dark', 'opendyslexic']],
['dark', ['highcontrast', 'opendyslexic'], ['opendyslexic', 'dark']],
['dark', ['light-highcontrast', 'opendyslexic'], ['opendyslexic', 'dark']],
];
}

Expand Down Expand Up @@ -132,7 +132,7 @@ public function dataTestDisableTheme() {
['dark', [], []],
['dark', ['dark'], []],
['opendyslexic', ['dark', 'opendyslexic'], ['dark'], ],
['highcontrast', ['opendyslexic'], ['opendyslexic']],
['light-highcontrast', ['opendyslexic'], ['opendyslexic']],
];
}

Expand Down Expand Up @@ -167,7 +167,7 @@ public function dataTestIsEnabled() {
['dark', [], false],
['dark', ['dark'], true],
['opendyslexic', ['dark', 'opendyslexic'], true],
['highcontrast', ['opendyslexic'], false],
['light-highcontrast', ['opendyslexic'], false],
];
}

Expand Down Expand Up @@ -302,7 +302,7 @@ private function initThemes() {
$this->config,
$l10n,
),
'highcontrast' => new HighContrastTheme(
'light-highcontrast' => new HighContrastTheme(
$util,
$this->themingDefaults,
$urlGenerator,
Expand Down
4 changes: 2 additions & 2 deletions apps/theming/tests/Settings/PersonalTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ public function dataTestGetForm() {
$this->formatThemeForm('default'),
$this->formatThemeForm('light'),
$this->formatThemeForm('dark'),
$this->formatThemeForm('highcontrast'),
$this->formatThemeForm('light-highcontrast'),
$this->formatThemeForm('dark-highcontrast'),
$this->formatThemeForm('opendyslexic'),
]],
Expand Down Expand Up @@ -162,7 +162,7 @@ private function initThemes() {
$config,
$l10n,
),
'highcontrast' => new HighContrastTheme(
'light-highcontrast' => new HighContrastTheme(
$util,
$themingDefaults,
$urlGenerator,
Expand Down