diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2020-05-27 10:50:43 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-27 10:50:43 +0200 |
| commit | b9222ff596e93330800852c02a3a114977ec4127 (patch) | |
| tree | 98d58e8930fc31b745b2bc9195a4ca37a6c1ca68 /core | |
| parent | b9d17cfdecd57a877ab2e5ecddee43ea48edc67f (diff) | |
| parent | 9aff5355e63e800bcb59f97bd45bd552fe2eba55 (diff) | |
| download | nextcloud-server-b9222ff596e93330800852c02a3a114977ec4127.tar.gz nextcloud-server-b9222ff596e93330800852c02a3a114977ec4127.zip | |
Merge pull request #21117 from nextcloud/design/text-variables-simplify
Simplify text variables from 4 to 2, map -lighter to -maxcontrast
Diffstat (limited to 'core')
| -rw-r--r-- | core/css/css-variables.scss | 4 | ||||
| -rw-r--r-- | core/css/variables.scss | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/core/css/css-variables.scss b/core/css/css-variables.scss index cf0779000b6..df6bfa3b68d 100644 --- a/core/css/css-variables.scss +++ b/core/css/css-variables.scss @@ -23,8 +23,8 @@ --color-success: $color-success; --color-text-maxcontrast: $color-text-maxcontrast; - --color-text-light: $color-text-light; - --color-text-lighter: $color-text-lighter; + --color-text-light: $color-main-text; + --color-text-lighter: $color-text-maxcontrast; --image-logo: $image-logo; --image-login-background: $image-login-background; diff --git a/core/css/variables.scss b/core/css/variables.scss index 43d8535ba03..fc3c9d2d51e 100644 --- a/core/css/variables.scss +++ b/core/css/variables.scss @@ -61,8 +61,8 @@ $color-yellow: #FC0; // min. color contrast for normal text on white background according to WCAG AA // (Works as well: color: #000; opacity: 0.57;) $color-text-maxcontrast: nc-lighten($color-main-text, 33%) !default; -$color-text-light: nc-lighten($color-main-text, 15%) !default; -$color-text-lighter: nc-lighten($color-main-text, 30%) !default; +$color-text-light: $color-main-text !default; +$color-text-lighter: $color-text-maxcontrast !default; $image-logo: url('../img/logo/logo.svg?v=1') !default; $image-login-background: url('../img/background.png?v=2') !default; |