diff options
| author | John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com> | 2018-06-14 15:38:43 +0200 |
|---|---|---|
| committer | John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com> | 2018-06-20 19:20:51 +0200 |
| commit | b69d345677c97dbdbb45273aa89d7efcfac81c31 (patch) | |
| tree | 09fe1b4047a842be170282874d2f657a3a3abce6 /core | |
| parent | 1dc76f2f6bb4a14ac4c33e03aec7ec99270246f4 (diff) | |
| download | nextcloud-server-b69d345677c97dbdbb45273aa89d7efcfac81c31.tar.gz nextcloud-server-b69d345677c97dbdbb45273aa89d7efcfac81c31.zip | |
More default variables fallbacks
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
Diffstat (limited to 'core')
| -rw-r--r-- | core/css/header.scss | 2 | ||||
| -rw-r--r-- | core/css/variables.scss | 12 |
2 files changed, 7 insertions, 7 deletions
diff --git a/core/css/header.scss b/core/css/header.scss index c4f7165fb5c..1507a711636 100644 --- a/core/css/header.scss +++ b/core/css/header.scss @@ -73,7 +73,7 @@ /* Header menu */ .menu { background-color: var(--color-main-background); - filter: drop-shadow(0 1px 10px var(--color-box-shadow)); + filter: drop-shadow(0 1px 5px var(--color-box-shadow)); border-radius: 0 0 3px 3px; box-sizing: border-box; z-index: 2000; diff --git a/core/css/variables.scss b/core/css/variables.scss index c8fcc9f541e..e9ba208f483 100644 --- a/core/css/variables.scss +++ b/core/css/variables.scss @@ -17,16 +17,16 @@ $color-main-text: #000 !default; $color-main-background: #fff !default; // used for different active/disabled states -$color-background-dark: nc-darken($color-main-background, 7%); -$color-background-darker: nc-darken($color-main-background, 14%); +$color-background-dark: nc-darken($color-main-background, 7%) !default; +$color-background-darker: nc-darken($color-main-background, 14%) !default; $color-primary: #0082c9; $color-primary-text: #ffffff; // do not use nc-darken in case of overriding because // primary-text is independent of color-main-text -$color-primary-text-dark: darken($color-primary-text, 7%); -$color-primary-element: $color-primary; -$color-primary-element-light: nc-lighten($color-primary-element, 15%); +$color-primary-text-dark: darken($color-primary-text, 7%) !default; +$color-primary-element: $color-primary !default; +$color-primary-element-light: nc-lighten($color-primary-element, 15%) !default; $color-error: #e9322d; $color-warning: #eca700; @@ -45,7 +45,7 @@ $image-login-background: url('../img/background.png?v=2'); $color-loading-light: #ccc !default; $color-loading-dark: #777 !default; -$color-box-shadow: rgba(nc-darken($color-main-background, 70%), 0.75); +$color-box-shadow: rgba(nc-darken($color-main-background, 70%), 0.75) !default; // light border like file table or app-content list $color-border: nc-darken($color-main-background, 7%); |