From 641f7d96956c29c1a7829a968b80d22a48fb093b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Popovics=20Andr=C3=A1s?=
 <popovicsandras@users.noreply.github.com>
Date: Wed, 9 May 2018 16:11:25 +0100
Subject: [PATCH] [ADF_NOISSUE] Fix styling and sidenav layout fixes (#3291)

* Fix styling and sidenav layout fixes

* Revert packagr conflicting mods
---
 .angular-cli.json                             |  6 +-
 .../layout-container.component.scss           | 77 +++++++++----------
 .../layout-container.component.ts             |  3 +-
 3 files changed, 43 insertions(+), 43 deletions(-)

diff --git a/.angular-cli.json b/.angular-cli.json
index 66fa908da2..a5f19b9c08 100644
--- a/.angular-cli.json
+++ b/.angular-cli.json
@@ -117,8 +117,8 @@
         },
         {
           "glob": "**/*",
-          "input": "../../lib/core/prebuilt-themes",
-          "output": "./"
+          "input": "../../lib/dist/core/prebuilt-themes",
+          "output": "./assets/prebuilt-themes"
         },
         {
           "glob": "**/*",
@@ -170,7 +170,7 @@
       "prefix": "app-dev",
       "styles": [
         "styles.scss",
-        "custom-style.scss"
+        "custom-style-dev.scss"
       ],
       "stylePreprocessorOptions": {
         "includePaths": [
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 25ddda4424..0a457287a4 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
@@ -1,49 +1,48 @@
-:host {
-    display: block;
-    width: 100%;
-    height: 100%;
-    overflow: hidden;
-}
-
 @mixin adf-layout-container-theme($theme) {
     $foreground: map-get($theme, foreground);
 
-  ng-content {
-    display: block;
-    width: 100%;
-    height: 100%;
-    overflow: hidden;
-  }
+    adf-layout-container {
+        display: block;
+        width: 100%;
+        height: 100%;
+        overflow: hidden;
+    }    
 
-  .sidenav--hidden {
-    visibility: hidden !important;
-    width: 0 !important;
-    transform: unset !important;
-    opacity: 0 !important;
-  }
+    ng-content {
+        display: block;
+        width: 100%;
+        height: 100%;
+        overflow: hidden;
+    }
 
-  .mat-sidenav-container {
-    display: block;
-    width: 100%;
-    height: 100%;
-    overflow: hidden;
-  }
+    .sidenav--hidden {
+        visibility: hidden !important;
+        width: 0 !important;
+        transform: unset !important;
+        opacity: 0 !important;
+    }
 
-  .mat-sidenav {
-    overflow: hidden;
-    border-right: 1px solid mat-color($foreground, text, 0.07);
-  }
+    .mat-sidenav-container {
+        display: block;
+        width: 100%;
+        height: 100%;
+        overflow: hidden;
+    }
 
+    .mat-sidenav {
+        overflow: hidden;
+        border-right: 1px solid mat-color($foreground, text, 0.07);
+    }
 
-  mat-sidenav-content {
-    margin-left:0px !important;
-  }
+    mat-sidenav-content {
+        margin-left: 0px !important;
+    }
 
-  .mat-sidenav-content,
-  .mat-drawer-transition .mat-drawer-content {
-    transform: unset !important;
-    transition-property: unset !important;
-    transition-duration: unset !important;
-    transition-timing-function: unset !important;
-  }
+    .mat-sidenav-content,
+    .mat-drawer-transition .mat-drawer-content {
+        transform: unset !important;
+        transition-property: unset !important;
+        transition-duration: unset !important;
+        transition-timing-function: unset !important;
+    }
 }
diff --git a/lib/core/sidenav-layout/components/layout-container/layout-container.component.ts b/lib/core/sidenav-layout/components/layout-container/layout-container.component.ts
index 8370e2eb17..bd7f019179 100644
--- a/lib/core/sidenav-layout/components/layout-container/layout-container.component.ts
+++ b/lib/core/sidenav-layout/components/layout-container/layout-container.component.ts
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-import { Component, Input, ViewChild, OnInit, OnDestroy } from '@angular/core';
+import { Component, Input, ViewChild, OnInit, OnDestroy, ViewEncapsulation } from '@angular/core';
 import { MatSidenav } from '@angular/material';
 import { sidenavAnimation, contentAnimation } from '../../helpers/animations';
 
@@ -23,6 +23,7 @@ import { sidenavAnimation, contentAnimation } from '../../helpers/animations';
     selector: 'adf-layout-container',
     templateUrl: './layout-container.component.html',
     styleUrls: ['./layout-container.component.scss'],
+    encapsulation: ViewEncapsulation.None,
     animations: [ sidenavAnimation, contentAnimation ]
 })
 export class LayoutContainerComponent implements OnInit, OnDestroy {