Skip to content

Commit b701e19

Browse files
authored
Merge pull request #34333 from nextcloud/enh/33851/fix-tertiary-button
fix the tertiary button text
2 parents 743b913 + da48143 commit b701e19

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

apps/theming/css/default.css

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,14 +57,14 @@
5757
--color-primary-text: #ffffff;
5858
--color-primary-hover: #329bd3;
5959
--color-primary-light: #e5f2f9;
60-
--color-primary-light-text: #0082c9;
60+
--color-primary-light-text: #003450;
6161
--color-primary-light-hover: #dbe7ee;
6262
--color-primary-text-dark: #ededed;
6363
--color-primary-element: #0082c9;
6464
--color-primary-element-text: #ffffff;
6565
--color-primary-element-hover: #329bd3;
6666
--color-primary-element-light: #e5f2f9;
67-
--color-primary-element-light-text: #0082c9;
67+
--color-primary-element-light-text: #003450;
6868
--color-primary-element-light-hover: #dbe7ee;
6969
--color-primary-element-text-dark: #ededed;
7070
--gradient-primary-background: linear-gradient(40deg, var(--color-primary) 0%, var(--color-primary-hover) 100%);

apps/theming/lib/Themes/CommonThemeTrait.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ protected function generatePrimaryVariables(string $colorMainBackground, string
4545
'--color-primary-text' => $this->util->invertTextColor($this->primaryColor) ? '#000000' : '#ffffff',
4646
'--color-primary-hover' => $this->util->mix($this->primaryColor, $colorMainBackground, 60),
4747
'--color-primary-light' => $colorPrimaryLight,
48-
'--color-primary-light-text' => $this->primaryColor,
48+
'--color-primary-light-text' => $this->util->mix($this->primaryColor, $this->util->invertTextColor($colorPrimaryLight) ? '#000000' : '#ffffff', -20),
4949
'--color-primary-light-hover' => $this->util->mix($colorPrimaryLight, $colorMainText, 90),
5050
'--color-primary-text-dark' => $this->util->darken($this->util->invertTextColor($this->primaryColor) ? '#000000' : '#ffffff', 7),
5151

@@ -54,7 +54,7 @@ protected function generatePrimaryVariables(string $colorMainBackground, string
5454
'--color-primary-element-text' => $this->util->invertTextColor($colorPrimaryElement) ? '#000000' : '#ffffff',
5555
'--color-primary-element-hover' => $this->util->mix($colorPrimaryElement, $colorMainBackground, 60),
5656
'--color-primary-element-light' => $colorPrimaryElementLight,
57-
'--color-primary-element-light-text' => $colorPrimaryElement,
57+
'--color-primary-element-light-text' => $this->util->mix($colorPrimaryElement, $this->util->invertTextColor($colorPrimaryElementLight) ? '#000000' : '#ffffff', -20),
5858
'--color-primary-element-light-hover' => $this->util->mix($colorPrimaryElementLight, $colorMainText, 90),
5959
'--color-primary-element-text-dark' => $this->util->darken($this->util->invertTextColor($colorPrimaryElement) ? '#000000' : '#ffffff', 7),
6060

0 commit comments

Comments
 (0)