diff options
| author | Ferdinand Thiessen <opensource@fthiessen.de> | 2023-10-05 16:49:22 +0200 |
|---|---|---|
| committer | Ferdinand Thiessen <opensource@fthiessen.de> | 2023-10-27 12:56:23 +0200 |
| commit | be129a7d1f256a9a6aeaadbd9355c088fe0df929 (patch) | |
| tree | 2631720e4136db75371c8d1dcb021bfa2e5b83e2 /apps/theming | |
| parent | ec1ae4505b7ae111fed40f87d614a1b0121cc399 (diff) | |
| download | nextcloud-server-be129a7d1f256a9a6aeaadbd9355c088fe0df929.tar.gz nextcloud-server-be129a7d1f256a9a6aeaadbd9355c088fe0df929.zip | |
fix(theming): Make it clearer that color-text-light and -lighter are deprecated
Signed-off-by: Ferdinand Thiessen <opensource@fthiessen.de>
Diffstat (limited to 'apps/theming')
| -rw-r--r-- | apps/theming/css/default.css | 6 | ||||
| -rw-r--r-- | apps/theming/lib/Themes/DarkTheme.php | 4 | ||||
| -rw-r--r-- | apps/theming/lib/Themes/DefaultTheme.php | 4 |
3 files changed, 8 insertions, 6 deletions
diff --git a/apps/theming/css/default.css b/apps/theming/css/default.css index 702ab65569b..571ae8a7829 100644 --- a/apps/theming/css/default.css +++ b/apps/theming/css/default.css @@ -14,8 +14,10 @@ --color-text-maxcontrast: #707070; --color-text-maxcontrast-default: #707070; --color-text-maxcontrast-background-blur: #5e5e5e; - --color-text-light: #222222; - --color-text-lighter: #6f6f6f; + /** @deprecated use ` --color-main-text` instead */ + --color-text-light: var(--color-main-text); + /** @deprecated use `--color-text-maxcontrast` instead */ + --color-text-lighter: var(--color-text-maxcontrast); --color-scrollbar: rgba(34,34,34, .15); --color-error: #d91812; --color-error-rgb: 217,24,18; diff --git a/apps/theming/lib/Themes/DarkTheme.php b/apps/theming/lib/Themes/DarkTheme.php index 80c65cd0eb6..1def7f378a7 100644 --- a/apps/theming/lib/Themes/DarkTheme.php +++ b/apps/theming/lib/Themes/DarkTheme.php @@ -84,8 +84,8 @@ class DarkTheme extends DefaultTheme implements ITheme { '--color-text-maxcontrast' => $colorTextMaxcontrast, '--color-text-maxcontrast-default' => $colorTextMaxcontrast, '--color-text-maxcontrast-background-blur' => $this->util->lighten($colorTextMaxcontrast, 2), - '--color-text-light' => $this->util->darken($colorMainText, 10), - '--color-text-lighter' => $this->util->darken($colorMainText, 20), + '--color-text-light' => 'var(--color-main-text)', // deprecated + '--color-text-lighter' => 'var(--color-text-maxcontrast)', // deprecated '--color-error' => $colorError, '--color-error-rgb' => join(',', $this->util->hexToRGB($colorError)), diff --git a/apps/theming/lib/Themes/DefaultTheme.php b/apps/theming/lib/Themes/DefaultTheme.php index 820291146bf..0c2594ebe7f 100644 --- a/apps/theming/lib/Themes/DefaultTheme.php +++ b/apps/theming/lib/Themes/DefaultTheme.php @@ -138,8 +138,8 @@ class DefaultTheme implements ITheme { '--color-text-maxcontrast' => $colorTextMaxcontrast, '--color-text-maxcontrast-default' => $colorTextMaxcontrast, '--color-text-maxcontrast-background-blur' => $this->util->darken($colorTextMaxcontrast, 7), - '--color-text-light' => $colorMainText, - '--color-text-lighter' => $this->util->lighten($colorMainText, 30), + '--color-text-light' => 'var(--color-main-text)', // deprecated + '--color-text-lighter' => 'var(--color-text-maxcontrast)', // deprecated '--color-scrollbar' => 'rgba(' . $colorMainTextRgb . ', .15)', |