From c8cbc8d64542088d1052cd0fa58a6c6d581775c9 Mon Sep 17 00:00:00 2001
From: Eugenio Romano <eromano@users.noreply.github.com>
Date: Mon, 16 Apr 2018 22:42:22 +0100
Subject: [PATCH] fix cdk scrollable sidenav (#3204)

---
 .../app/components/app-layout/app-layout.component.html   | 3 +--
 .../app/components/app-layout/app-layout.component.scss   | 5 +++--
 .../layout-container/layout-container.component.html      | 8 +++++---
 .../layout-container/layout-container.component.scss      | 5 +++++
 4 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/demo-shell/src/app/components/app-layout/app-layout.component.html b/demo-shell/src/app/components/app-layout/app-layout.component.html
index 36c6cbd6d0..f2b98c3e29 100644
--- a/demo-shell/src/app/components/app-layout/app-layout.component.html
+++ b/demo-shell/src/app/components/app-layout/app-layout.component.html
@@ -1,4 +1,3 @@
-
 <adf-sidenav-layout [sidenavMin]="70" [sidenavMax]="220" [stepOver]="780" [hideSidenav]="false" [expandedSidenav]="false">
 
     <adf-sidenav-layout-header>
@@ -52,4 +51,4 @@
         </ng-template>
     </adf-sidenav-layout-content>
 
-</adf-sidenav-layout>
\ No newline at end of file
+</adf-sidenav-layout>
diff --git a/demo-shell/src/app/components/app-layout/app-layout.component.scss b/demo-shell/src/app/components/app-layout/app-layout.component.scss
index 68c59c7a14..54fb3211e2 100644
--- a/demo-shell/src/app/components/app-layout/app-layout.component.scss
+++ b/demo-shell/src/app/components/app-layout/app-layout.component.scss
@@ -19,8 +19,9 @@
    }
 
    .adf-app-layout-toolbar {
-     position: relative;
-     overflow: visible !important;
+       z-index: 200000;
+       position: relative;
+       overflow: visible !important;
    }
 
   .adf-app-layout {
diff --git a/lib/core/sidenav-layout/components/layout-container/layout-container.component.html b/lib/core/sidenav-layout/components/layout-container/layout-container.component.html
index 83856bbd36..f139ca802e 100644
--- a/lib/core/sidenav-layout/components/layout-container/layout-container.component.html
+++ b/lib/core/sidenav-layout/components/layout-container/layout-container.component.html
@@ -7,7 +7,9 @@
         <ng-content sidenav select="[app-layout-navigation]"></ng-content>
     </mat-sidenav>
 
-    <mat-sidenav-content [@contentAnimation]="contentAnimationState">
-        <ng-content select="[app-layout-content]"></ng-content>
-    </mat-sidenav-content>
+    <div>
+        <div [@contentAnimation]="contentAnimationState" style="margin-left: 0 !important">
+            <ng-content select="[app-layout-content]"></ng-content>
+        </div>
+    </div>
 </mat-sidenav-container>
diff --git a/lib/core/sidenav-layout/components/layout-container/layout-container.component.scss b/lib/core/sidenav-layout/components/layout-container/layout-container.component.scss
index eca3fb0e31..c7bba25d80 100644
--- a/lib/core/sidenav-layout/components/layout-container/layout-container.component.scss
+++ b/lib/core/sidenav-layout/components/layout-container/layout-container.component.scss
@@ -30,6 +30,11 @@ ng-content {
     overflow: hidden;
 }
 
+
+:host ::ng-deep mat-sidenav-content{
+    margin-left:0px !important;
+}
+
 .mat-sidenav-content,
 .mat-drawer-transition .mat-drawer-content {
     transform: unset !important;