summaryrefslogtreecommitdiffstats
path: root/apps/theming/css
diff options
context:
space:
mode:
authorRoeland Jago Douma <rullzer@users.noreply.github.com>2019-11-26 12:01:47 +0100
committerGitHub <noreply@github.com>2019-11-26 12:01:47 +0100
commit2a2d0cd3126886ab12672d2983a04e8cb800fe98 (patch)
treeba1136ae37b4d6d778b926c18c0961b6db6dc3d9 /apps/theming/css
parent1fac8174b9d41bd150f214f7adfa8cbf6ab51bd7 (diff)
parent067ee3150c73e1ebc9461eaf7f8c8c4649071f21 (diff)
downloadnextcloud-server-2a2d0cd3126886ab12672d2983a04e8cb800fe98.tar.gz
nextcloud-server-2a2d0cd3126886ab12672d2983a04e8cb800fe98.zip
Merge pull request #18082 from nextcloud/design/style-update
Update style of log in page and header
Diffstat (limited to 'apps/theming/css')
-rw-r--r--apps/theming/css/theming.scss29
1 files changed, 24 insertions, 5 deletions
diff --git a/apps/theming/css/theming.scss b/apps/theming/css/theming.scss
index 368b3f33c5d..4ed9d0f9ff4 100644
--- a/apps/theming/css/theming.scss
+++ b/apps/theming/css/theming.scss
@@ -7,6 +7,19 @@
@return (0.2126 * $-local-red + 0.7152 * $-local-green + 0.0722 * $-local-blue) / 255;
}
+@mixin faded-background {
+ background-image: linear-gradient(40deg, $color-primary 0%, lighten($color-primary, 20%) 100%);
+}
+
+@mixin faded-background-image {
+ @if ($color-primary == #0082C9) {
+ background-image: $image-login-background, linear-gradient(40deg, $color-primary 0%, lighten($color-primary, 20%) 100%);
+ } @else {
+ @include faded-background;
+ background-size: contain;
+ }
+}
+
$has-custom-logo: variable_exists('theming-logo-mime') and $theming-logo-mime != '';
$invert: luma($color-primary) > 0.6;
@@ -115,6 +128,10 @@ $invert: luma($color-primary) > 0.6;
background-image: $image-logo;
}
+#body-user #header, #body-settings #header, #body-public #header {
+ @include faded-background;
+}
+
/* override styles for login screen in guest.css */
@if ($has-custom-logo) {
// custom logo
@@ -142,12 +159,14 @@ $invert: luma($color-primary) > 0.6;
#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;
- }
+ #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 != '' {
@@ -217,7 +236,7 @@ input.primary,
}
} @else {
#body-login {
- background-color: $color-primary;
+ @include faded-background-image;
}
}