From 8ad9017c1a0198c15933d4a56fb029254355b0c7 Mon Sep 17 00:00:00 2001
From: Eugenio Romano <eugenio.romano@alfresco.com>
Date: Mon, 30 Oct 2017 11:18:11 +0000
Subject: [PATCH] remove duplicate style file

---
 demo-shell-ng2/.angular-cli.json |  4 ++--
 demo-shell-ng2/src/styles.css    | 15 ---------------
 demo-shell-ng2/src/styles.scss   | 26 ++++++++------------------
 3 files changed, 10 insertions(+), 35 deletions(-)
 delete mode 100644 demo-shell-ng2/src/styles.css

diff --git a/demo-shell-ng2/.angular-cli.json b/demo-shell-ng2/.angular-cli.json
index ac11d6c807..b0672810d3 100644
--- a/demo-shell-ng2/.angular-cli.json
+++ b/demo-shell-ng2/.angular-cli.json
@@ -113,7 +113,7 @@
       "testTsconfig": "tsconfig.spec.json",
       "prefix": "app",
       "styles": [
-        "styles.css",
+        "styles.scss",
         "custom-style.scss"
       ],
       "stylePreprocessorOptions": {
@@ -324,7 +324,7 @@
       "testTsconfig": "tsconfig.spec.json",
       "prefix": "app-dev",
       "styles": [
-        "styles.css",
+        "styles.scss",
         "custom-style.scss"
       ],
       "stylePreprocessorOptions": {
diff --git a/demo-shell-ng2/src/styles.css b/demo-shell-ng2/src/styles.css
deleted file mode 100644
index 7a2ccfcee0..0000000000
--- a/demo-shell-ng2/src/styles.css
+++ /dev/null
@@ -1,15 +0,0 @@
-/* You can add global styles to this file, and also import other style files */
-/*@import "~@angular/material/prebuilt-themes/indigo-pink.css";*/
-
-.mat-form-field input.mat-input-element {
-  line-height: normal;
-}
-
-body, html {
-  height: 100%;
-  font-family: 'Muli', "Helvetica", "Arial", sans-serif !important;
-}
-
-body {
-  margin: 0;
-}
diff --git a/demo-shell-ng2/src/styles.scss b/demo-shell-ng2/src/styles.scss
index f39629b2b8..f48e604af6 100644
--- a/demo-shell-ng2/src/styles.scss
+++ b/demo-shell-ng2/src/styles.scss
@@ -1,22 +1,12 @@
-@import '~@angular/material/prebuilt-themes/deeppurple-amber.css';
+.mat-form-field input.mat-input-element {
+  line-height: normal;
+}
+
+body, html {
+  height: 100%;
+  font-family: 'Muli', "Helvetica", "Arial", sans-serif !important;
+}
 
 body {
-  font-family: Roboto, Arial, sans-serif;
   margin: 0;
 }
-
-.basic-container {
-  padding: 5px;
-}
-
-.version-info {
-  font-size: 8pt;
-  float: right;
-}
-
-/**
- * Copyright Google LLC All Rights Reserved.
- *
- * Use of this source code is governed by an MIT-style license that can be
- * found in the LICENSE file at https://angular.io/license
- */