Skip to content
Closed
Changes from 1 commit
Commits
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
Prev Previous commit
Keep header gradient when using default theme color.
  • Loading branch information
earboxer committed Mar 20, 2020
commit daba23be5ad90ebd6362f93eef69c9a45c31feab
3 changes: 3 additions & 0 deletions core/css/header.scss
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,9 @@
z-index: 2000;
height: $header-height;
background-color: var(--color-primary);
@if ($color-primary == #0082C9) {
background-image: linear-gradient(40deg, $color-primary 0%, lighten($color-primary, 20%) 100%);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This breaks the default background image. That change should go to theming.scss. Maybe you can try something like this, to make sure that the gradient is properly set otherwise:

diff --git a/apps/theming/css/theming.scss b/apps/theming/css/theming.scss
index 0e9b922b27..c2a58dcc3d 100644
--- a/apps/theming/css/theming.scss
+++ b/apps/theming/css/theming.scss
@@ -8,7 +8,11 @@
 }
 
 @mixin faded-background {
-       background-image: linear-gradient(40deg, $color-primary 0%, lighten($color-primary, 20%) 100%);
+       @if ($color-primary == #0082C9) {
+               background-image: linear-gradient(40deg, $color-primary 0%, lighten($color-primary, 20%) 100%);
+       } @else {
+               background-color: $color-primary;
+       }
 }
 
 @mixin faded-background-image {
@@ -23,6 +27,10 @@
                @include faded-background;
                background-size: contain;
        }
+
+       @if ($color-primary != #0082C9) and ($has-custom-background == false) {
+               background-image: none;
+       }
 }

}
box-sizing: border-box;
justify-content: space-between;
}
Expand Down