Skip to content

[stable18] Only use background fade if nextcloud blue is set #21309

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rullzer merged 1 commit into from
Jun 9, 2020
Merged

[stable18] Only use background fade if nextcloud blue is set #21309

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Only use background fade if nextcloud blue is set 
Signed-off-by: Julius Härtl <[email protected]>
  • Loading branch information
@juliusknorr @backportbot
juliusknorr authored and backportbot[bot] committed Jun 8, 2020
commit 414a3ae4e98ef5fcd5a9b286ed924ed1bd02b99f
53 changes: 23 additions & 30 deletions apps/theming/css/theming.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
@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;
}
} @else {
@include faded-background;
background-size: contain;
@if($has-custom-background == true) {
background-size: cover;
background-repeat: no-repeat;
background-image: $image-login-background;
}
}

Expand Down Expand Up @@ -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
Expand All @@ -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 {
Expand Down Expand Up @@ -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 {

Expand All @@ -240,10 +237,6 @@ input.primary,
}

}
} @else {
#body-login {
@include faded-background-image;
}
}

/** Handle primary buttons for bright colors */
Expand Down