open-dsi
/
nextcloud-server
mirror of https://github.com/nextcloud/server
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix(theming): Adjust `color-error` and `color-success` to work for input border colors

Browse Source 
Signed-off-by: Ferdinand Thiessen <opensource@fthiessen.de>
pull/42329/head
Ferdinand Thiessen 2 years ago committed by Eduardo Morales
parent 74f6995bdb
commit acfb8ef551
3 changed files with 12 additions and 12 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 8
      apps/theming/css/default.css
  2. 12
      apps/theming/lib/Themes/DarkTheme.php
  3. 4
      apps/theming/lib/Themes/DefaultTheme.php

8
apps/theming/css/default.css
Unescape View File

@ -21,10 +21,10 @@
/** @deprecated use `--color-text-maxcontrast` instead */ /** @deprecated use `--color-text-maxcontrast` instead */
--color-text-lighter: var(--color-text-maxcontrast); --color-text-lighter: var(--color-text-maxcontrast);
--color-scrollbar: rgba(34,34,34, .15); --color-scrollbar: rgba(34,34,34, .15);
--color-error: #C00505; --color-error: #DB0606;
--color-error-rgb: 192,5,5; --color-error-rgb: 219,6,6;
--color-error-hover: #c72424; --color-error-hover: #df2525;
--color-error-text: #C00505; --color-error-text: #c20505;
--color-warning: #A37200; --color-warning: #A37200;
--color-warning-rgb: 163,114,0; --color-warning-rgb: 163,114,0;
--color-warning-hover: #8a6000; --color-warning-hover: #8a6000;

12
apps/theming/lib/Themes/DarkTheme.php
Unescape View File

@ -52,17 +52,17 @@ class DarkTheme extends DefaultTheme implements ITheme {
public function getCSSVariables(): array { public function getCSSVariables(): array {
$defaultVariables = parent::getCSSVariables(); $defaultVariables = parent::getCSSVariables();
$colorMainText = '#D8D8D8'; $colorMainText = '#EBEBEB';
$colorMainBackground = '#171717'; $colorMainBackground = '#171717';
$colorMainBackgroundRGB = join(',', $this->util->hexToRGB($colorMainBackground)); $colorMainBackgroundRGB = join(',', $this->util->hexToRGB($colorMainBackground));
$colorTextMaxcontrast = $this->util->darken($colorMainText, 28); $colorTextMaxcontrast = $this->util->darken($colorMainText, 32);
$colorBoxShadow = $this->util->darken($colorMainBackground, 70); $colorBoxShadow = $this->util->darken($colorMainBackground, 70);
$colorBoxShadowRGB = join(',', $this->util->hexToRGB($colorBoxShadow)); $colorBoxShadowRGB = join(',', $this->util->hexToRGB($colorBoxShadow));
$colorError = '#FF5252'; $colorError = '#FF3333';
$colorWarning = '#FFCC00'; $colorWarning = '#FFCC00';
$colorSuccess = '#50BB50'; $colorSuccess = '#3B973B';
$colorInfo = '#00AEFF'; $colorInfo = '#00AEFF';
return array_merge( return array_merge(
@ -92,7 +92,7 @@ class DarkTheme extends DefaultTheme implements ITheme {
'--color-error' => $colorError, '--color-error' => $colorError,
'--color-error-rgb' => join(',', $this->util->hexToRGB($colorError)), '--color-error-rgb' => join(',', $this->util->hexToRGB($colorError)),
'--color-error-hover' => $this->util->lighten($colorError, 10), '--color-error-hover' => $this->util->lighten($colorError, 10),
'--color-error-text' => $this->util->lighten($colorError, 10), '--color-error-text' => $this->util->lighten($colorError, 15),
'--color-warning' => $colorWarning, '--color-warning' => $colorWarning,
'--color-warning-rgb' => join(',', $this->util->hexToRGB($colorWarning)), '--color-warning-rgb' => join(',', $this->util->hexToRGB($colorWarning)),
'--color-warning-hover' => $this->util->lighten($colorWarning, 10), '--color-warning-hover' => $this->util->lighten($colorWarning, 10),
@ -100,7 +100,7 @@ class DarkTheme extends DefaultTheme implements ITheme {
'--color-success' => $colorSuccess, '--color-success' => $colorSuccess,
'--color-success-rgb' => join(',', $this->util->hexToRGB($colorSuccess)), '--color-success-rgb' => join(',', $this->util->hexToRGB($colorSuccess)),
'--color-success-hover' => $this->util->lighten($colorSuccess, 10), '--color-success-hover' => $this->util->lighten($colorSuccess, 10),
'--color-success-text' => $colorSuccess, '--color-success-text' => $this->util->lighten($colorSuccess, 15),
'--color-info' => $colorInfo, '--color-info' => $colorInfo,
'--color-info-rgb' => join(',', $this->util->hexToRGB($colorInfo)), '--color-info-rgb' => join(',', $this->util->hexToRGB($colorInfo)),
'--color-info-hover' => $this->util->lighten($colorInfo, 10), '--color-info-hover' => $this->util->lighten($colorInfo, 10),

4
apps/theming/lib/Themes/DefaultTheme.php
Unescape View File

@ -111,7 +111,7 @@ class DefaultTheme implements ITheme {
$colorBoxShadow = $this->util->darken($colorMainBackground, 70); $colorBoxShadow = $this->util->darken($colorMainBackground, 70);
$colorBoxShadowRGB = join(',', $this->util->hexToRGB($colorBoxShadow)); $colorBoxShadowRGB = join(',', $this->util->hexToRGB($colorBoxShadow));
$colorError = '#C00505'; $colorError = '#DB0606';
$colorWarning = '#A37200'; $colorWarning = '#A37200';
$colorSuccess = '#2d7b41'; $colorSuccess = '#2d7b41';
$colorInfo = '#0071ad'; $colorInfo = '#0071ad';
@ -148,7 +148,7 @@ class DefaultTheme implements ITheme {
'--color-error' => $colorError, '--color-error' => $colorError,
'--color-error-rgb' => join(',', $this->util->hexToRGB($colorError)), '--color-error-rgb' => join(',', $this->util->hexToRGB($colorError)),
'--color-error-hover' => $this->util->mix($colorError, $colorMainBackground, 75), '--color-error-hover' => $this->util->mix($colorError, $colorMainBackground, 75),
'--color-error-text' => $colorError, '--color-error-text' => $this->util->darken($colorError, 5),
'--color-warning' => $colorWarning, '--color-warning' => $colorWarning,
'--color-warning-rgb' => join(',', $this->util->hexToRGB($colorWarning)), '--color-warning-rgb' => join(',', $this->util->hexToRGB($colorWarning)),
'--color-warning-hover' => $this->util->darken($colorWarning, 5), '--color-warning-hover' => $this->util->darken($colorWarning, 5),

Write Preview
Loading…
Cancel
Save