diff options
| author | Joas Schilling <213943+nickvergessen@users.noreply.github.com> | 2019-09-17 15:54:35 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-09-17 15:54:35 +0200 |
| commit | 89880fb2c4cb4f7bf5dd51a6983ddebcab01ead9 (patch) | |
| tree | 4bbe6d1f9b9aac89516a7fbc31f77a7552577630 | |
| parent | 8cc41974a43ce893fee58b44ac8c213461eaa898 (diff) | |
| parent | 223046b079e54b0c811b5203bc40ad81f34198b9 (diff) | |
| download | nextcloud-server-89880fb2c4cb4f7bf5dd51a6983ddebcab01ead9.tar.gz nextcloud-server-89880fb2c4cb4f7bf5dd51a6983ddebcab01ead9.zip | |
Merge pull request #17098 from nextcloud/fix/css/variables-color-primary-light
Create color-primary-light variable
| -rw-r--r-- | apps/theming/css/theming.scss | 3 | ||||
| -rw-r--r-- | core/css/css-variables.scss | 1 | ||||
| -rw-r--r-- | core/css/variables.scss | 1 |
3 files changed, 5 insertions, 0 deletions
diff --git a/apps/theming/css/theming.scss b/apps/theming/css/theming.scss index 4d63674e35e..f21f00f438a 100644 --- a/apps/theming/css/theming.scss +++ b/apps/theming/css/theming.scss @@ -31,6 +31,9 @@ $invert: luma($color-primary) > 0.6; } @if ($invert) { + // too bright, use dark text to mix the primary + $color-primary-light: mix($color-primary, $color-main-text, 10%); + #appmenu:not(.inverted) svg { filter: invert(1); } diff --git a/core/css/css-variables.scss b/core/css/css-variables.scss index 9db5337468e..e369874dec7 100644 --- a/core/css/css-variables.scss +++ b/core/css/css-variables.scss @@ -11,6 +11,7 @@ --color-background-darker: $color-background-darker; --color-primary: $color-primary; + --color-primary-light: $color-primary-light; --color-primary-text: $color-primary-text; --color-primary-text-dark: $color-primary-text-dark; --color-primary-element: $color-primary-element; diff --git a/core/css/variables.scss b/core/css/variables.scss index 8a13121ba7d..114cbd83370 100644 --- a/core/css/variables.scss +++ b/core/css/variables.scss @@ -40,6 +40,7 @@ $color-background-dark: nc-darken($color-main-background, 7%) !default; $color-background-darker: nc-darken($color-main-background, 14%) !default; $color-primary: #0082c9 !default; +$color-primary-light: mix($color-primary, $color-main-background, 10%) !default; $color-primary-text: #ffffff !default; // do not use nc-darken/lighten in case of overriding because // primary-text is independent of color-main-text |