From 93975e255871c6338fa96b64dbdbf7e583cec9e5 Mon Sep 17 00:00:00 2001
From: Eugenio Romano <eugenio.romano@alfresco.com>
Date: Sat, 18 Nov 2017 12:22:23 +0000
Subject: [PATCH] move typography modify in general theme

---
 demo-shell/src/custom-style-dev.scss |  9 +++++++++
 demo-shell/src/custom-style.scss     |  9 +++++++++
 demo-shell/src/styles.scss           | 11 -----------
 3 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/demo-shell/src/custom-style-dev.scss b/demo-shell/src/custom-style-dev.scss
index 06ab4933a6..18eb2e1e3a 100644
--- a/demo-shell/src/custom-style-dev.scss
+++ b/demo-shell/src/custom-style-dev.scss
@@ -21,3 +21,12 @@ $theme:   mat-light-theme($primary, $accent, $warn);
 @include adf-process-services-theme($theme);
 @include adf-insights-theme($theme);
 @include adf-core-theme($theme);
+
+body, html {
+    margin: 0;
+    height: 100%;
+    overflow: hidden;
+    font-size: mat-font-size($alfresco-typography, body-1);
+    font-family: mat-font-family($alfresco-typography);
+    line-height: mat-line-height($alfresco-typography, body-1);
+}
diff --git a/demo-shell/src/custom-style.scss b/demo-shell/src/custom-style.scss
index 83a776ee0a..5288d808af 100644
--- a/demo-shell/src/custom-style.scss
+++ b/demo-shell/src/custom-style.scss
@@ -21,3 +21,12 @@ $theme:   mat-light-theme($primary, $accent, $warn);
 @include adf-process-services-theme($theme);
 @include adf-insights-theme($theme);
 @include adf-core-theme($theme);
+
+body, html {
+    margin: 0;
+    height: 100%;
+    overflow: hidden;
+    font-size: mat-font-size($alfresco-typography, body-1);
+    font-family: mat-font-family($alfresco-typography);
+    line-height: mat-line-height($alfresco-typography, body-1);
+}
diff --git a/demo-shell/src/styles.scss b/demo-shell/src/styles.scss
index 0379ec12a6..e69de29bb2 100644
--- a/demo-shell/src/styles.scss
+++ b/demo-shell/src/styles.scss
@@ -1,11 +0,0 @@
-@import '~@angular/material/theming';
-@import '~@alfresco/adf-core/theming';
-
-body, html {
-    margin: 0;
-    height: 100%;
-    overflow: hidden;
-    font-size: mat-font-size($alfresco-typography, body-1);
-    font-family: mat-font-family($alfresco-typography);
-    line-height: mat-line-height($alfresco-typography, body-1);
-}