mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #21308 from nextcloud/backport/21198/stable19 

[stable19] Only use background fade if nextcloud blue is set
This commit is contained in:
Roeland Jago Douma 2020-06-09 09:50:13 +02:00 committed by GitHub
parent d753435452 69de44ecab
commit b20b92441e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 24 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
apps/theming/css/theming.scss
View File

@ -8,20 +8,28 @@
}
@mixin faded-background {
background-image: linear-gradient(40deg, $color-primary 0%, lighten($color-primary, 20%) 100%);
background-color: $color-primary;
@if ($color-primary == #0082C9) {
background-image: linear-gradient(40deg, $color-primary 0%, lighten($color-primary, 20%) 100%);
} @else {
/** This will be overwritten by the faded-background-image mixin if needed */
background-image: none;
}
}
@mixin faded-background-image {
@if ($color-primary == #0082C9) or ($has-custom-background == true) {
background-image: $image-login-background, linear-gradient(40deg, $color-primary 0%, lighten($color-primary, 20%) 100%);
@include faded-background;
background-size: contain;
@if($has-custom-background == true) {
background-size: cover;
background-repeat: no-repeat;
}
} @else {
@include faded-background;
background-size: contain;
@if ($color-primary == #0082C9) {
background-image: $image-login-background, linear-gradient(40deg, $color-primary 0%, lighten($color-primary, 20%) 100%);
}
@if($has-custom-background == true) {
background-size: cover;
background-repeat: no-repeat;
background-image: $image-login-background;
}
}
@ -138,6 +146,12 @@ $invert: luma($color-primary) > 0.6;
@include faded-background;
}
#body-login,
#firstrunwizard .firstrunwizard-header,
#theming-preview {
@include faded-background-image;
}
/* override styles for login screen in guest.css */
@if ($has-custom-logo) {
// custom logo
@ -159,22 +173,6 @@ $invert: luma($color-primary) > 0.6;
}
}
@if variable_exists('theming-background-mime') and $theming-background-mime != '' {
#body-login,
#firstrunwizard .firstrunwizard-header,
#theming-preview {
background-image: $image-login-background;
background-color: $color-primary;
@include faded-background-image;
}
} @else {
#theming-preview {
background-image: $image-login-background;
background-color: $color-primary;
@include faded-background-image;
}
}
@if variable_exists('theming-logoheader-mime') and $theming-logoheader-mime != '' {
#theming .advanced-option-logoheader .image-preview,
body:not(#body-login) #header .logo {
@ -231,7 +229,6 @@ input.primary,
@if $image-login-plain == 'true' {
#body-login, #firstrunwizard .firstrunwizard-header, #theming-preview {
background-image: none !important;
background-color: $color-primary;
}
#body-login {
@ -240,10 +237,6 @@ input.primary,
}
}
} @else {
#body-login {
@include faded-background-image;
}
}
/** Handle primary buttons for bright colors */