upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-02-14 08:14:47 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Merge pull request #42897 from nextcloud/backport/42887/stable28

Browse source 
[stable28] fix(theming): Make sure `color-border-maxcontrast` fulfills 3:1 contrast
This commit is contained in:
Ferdinand Thiessen 2024-01-18 02:28:07 +01:00 committed by GitHub
commit 0b9e2fa4bc
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
6 changed files with 17 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/theming/css/default.css
View file

@ -43,7 +43,7 @@
--color-box-shadow: rgba(var(--color-box-shadow-rgb), 0.5);
--color-border: #ededed;
--color-border-dark: #dbdbdb;
--color-border-maxcontrast: #949494;
--color-border-maxcontrast: #7d7d7d;
--font-face: system-ui, -apple-system, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, Ubuntu, 'Helvetica Neue', 'Noto Sans', 'Liberation Sans', Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol', 'Noto Color Emoji';
--default-font-size: 15px;
--animation-quick: 100ms;

1
apps/theming/lib/Themes/DarkHighContrastTheme.php
View file

@ -118,6 +118,7 @@ class DarkHighContrastTheme extends DarkTheme implements ITheme {
'--color-border' => $this->util->lighten($colorMainBackground, 50),
'--color-border-dark' => $this->util->lighten($colorMainBackground, 50),
'--color-border-maxcontrast' => $this->util->lighten($colorMainBackground, 55),
]
);
}

2
apps/theming/lib/Themes/DarkTheme.php
View file

@ -115,7 +115,7 @@ class DarkTheme extends DefaultTheme implements ITheme {
'--color-border' => $this->util->lighten($colorMainBackground, 7),
'--color-border-dark' => $this->util->lighten($colorMainBackground, 14),
'--color-border-maxcontrast' => $this->util->lighten($colorMainBackground, 30),
'--color-border-maxcontrast' => $this->util->lighten($colorMainBackground, 40),
'--background-invert-if-dark' => 'invert(100%)',
'--background-invert-if-bright' => 'no',

2
apps/theming/lib/Themes/DefaultTheme.php
View file

@ -171,7 +171,7 @@ class DefaultTheme implements ITheme {
'--color-border' => $this->util->darken($colorMainBackground, 7),
'--color-border-dark' => $this->util->darken($colorMainBackground, 14),
'--color-border-maxcontrast' => $this->util->darken($colorMainBackground, 42),
'--color-border-maxcontrast' => $this->util->darken($colorMainBackground, 51),
'--font-face' => "system-ui, -apple-system, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, Ubuntu, 'Helvetica Neue', 'Noto Sans', 'Liberation Sans', Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol', 'Noto Color Emoji'",
'--default-font-size' => '15px',

1
apps/theming/lib/Themes/HighContrastTheme.php
View file

@ -121,6 +121,7 @@ class HighContrastTheme extends DefaultTheme implements ITheme {
'--color-border' => $this->util->darken($colorMainBackground, 50),
'--color-border-dark' => $this->util->darken($colorMainBackground, 50),
'--color-border-maxcontrast' => $this->util->darken($colorMainBackground, 56),
]
);
}

12
apps/theming/tests/Themes/AccessibleThemeTestCase.php
View file

@ -74,6 +74,18 @@ class AccessibleThemeTestCase extends TestCase {
],
$elementContrast,
],
'border-colors' => [
[
'--color-border-maxcontrast',
],
[
'--color-main-background',
'--color-background-hover',
'--color-background-dark',
'--color-main-background-blur',
],
$elementContrast,
],
// Those two colors are used for borders which will be `color-main-text` on focussed state, thus need 3:1 contrast to it
'success-error-border-colors' => [
[