From ebfc40b1c8605263961d052b835ee5cb38a9978e Mon Sep 17 00:00:00 2001
From: davidcanonieto <david.cano@alfresco.com>
Date: Wed, 2 May 2018 09:59:01 +0100
Subject: [PATCH] [ADF-2760] Toolbar and datatable background colours fixed
 (#3250)

* [ADF-2760] Toolbar and datatable background colours fixed

* [ADF-2760] Improved variables for background colors

* [ADF-2760] comment removed

* [ADF-2760] fixed for dark themes
---
 demo-shell/src/custom-style.scss                                | 1 -
 .../datatable/components/datatable/datatable.component.scss     | 1 +
 lib/core/styles/_variables.scss                                 | 2 +-
 lib/core/toolbar/toolbar.component.scss                         | 2 ++
 4 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/demo-shell/src/custom-style.scss b/demo-shell/src/custom-style.scss
index b17df8df24..2937aa10bb 100644
--- a/demo-shell/src/custom-style.scss
+++ b/demo-shell/src/custom-style.scss
@@ -24,7 +24,6 @@ $theme:   mat-light-theme($primary, $accent, $warn);
 @include adf-login-component-theme($theme);
 @include adf-process-service-component-theme($theme);
 
-
 @include adf-content-services-theme($theme);
 @include adf-process-services-theme($theme);
 @include adf-insights-theme($theme);
diff --git a/lib/core/datatable/components/datatable/datatable.component.scss b/lib/core/datatable/components/datatable/datatable.component.scss
index ef6551399e..1cfc40a7a5 100644
--- a/lib/core/datatable/components/datatable/datatable.component.scss
+++ b/lib/core/datatable/components/datatable/datatable.component.scss
@@ -170,6 +170,7 @@
         border-collapse: collapse;
         white-space: nowrap;
         font-size: $data-table-font-size;
+        background-color: mat-color($background, card);
 
         /* Firefox fixes */
         border-collapse: unset;
diff --git a/lib/core/styles/_variables.scss b/lib/core/styles/_variables.scss
index f783a374ac..23032cdc4b 100644
--- a/lib/core/styles/_variables.scss
+++ b/lib/core/styles/_variables.scss
@@ -5,4 +5,4 @@ $animation-curve-fast-out-slow-in: cubic-bezier(0.4, 0, 0.2, 1) !default;
 $animation-curve-default: $animation-curve-fast-out-slow-in !default;
 
 $swift-ease-in-duration: 300ms !default;
-$swift-ease-in-timing-function: cubic-bezier(0.55, 0, 0.55, 0.2) !default;
+$swift-ease-in-timing-function: cubic-bezier(0.55, 0, 0.55, 0.2) !default;
\ No newline at end of file
diff --git a/lib/core/toolbar/toolbar.component.scss b/lib/core/toolbar/toolbar.component.scss
index adf2e845a0..8d099bb38f 100644
--- a/lib/core/toolbar/toolbar.component.scss
+++ b/lib/core/toolbar/toolbar.component.scss
@@ -1,6 +1,7 @@
 
 @mixin adf-toolbar-theme($theme) {
     $foreground: map-get($theme, foreground);
+    $background: map-get($theme, background);
     $adf-toolbar-height: 48px;
     $adf-toolbar-font-size: 14px;
 
@@ -17,6 +18,7 @@
         .mat-toolbar {
             min-height: $adf-toolbar-height;
             border: 1px solid mat-color($foreground, text, .07);
+            background-color: mat-color($background, hover, .02);
         }
 
         .mat-toolbar-row {