From 34586e9122cf985c4f78d1fba46a510256b58c22 Mon Sep 17 00:00:00 2001
From: Tynarus <admin@tynarus.com>
Date: Mon, 11 Sep 2017 20:57:58 -0500
Subject: [PATCH 1/2] Adding global scss file and fixing various style loaders.

---
 config/build/webpack.common.js | 11 ++++++++---
 package.json                   |  2 +-
 src/app/app.component.html     |  2 ++
 src/app/app.component.scss     | 13 ++-----------
 src/app/app.component.ts       |  5 ++---
 src/constants.scss             |  2 +-
 src/global.scss                | 12 ++++++++++++
 7 files changed, 28 insertions(+), 19 deletions(-)
 create mode 100644 src/global.scss

diff --git a/config/build/webpack.common.js b/config/build/webpack.common.js
index cd6ffb5..2ceb1f4 100644
--- a/config/build/webpack.common.js
+++ b/config/build/webpack.common.js
@@ -6,7 +6,8 @@ module.exports = {
     entry: {
         'polyfills': './src/polyfills.ts',
         'vendor': './src/vendor.ts',
-        'app': './src/main.ts'
+        'app': './src/main.ts',
+        'styles': [ './src\\global.scss' ]
     },
 
     resolve: {
@@ -27,8 +28,12 @@ module.exports = {
             },
             {
                 test: /\.scss$/,
-                exclude: /node_modules/,
-                use: [ 'raw-loader', 'css-loader', 'sass-loader' ]
+                exclude: [ /node_modules/, helpers.root('src', 'global.scss') ],
+                use: [ 'raw-loader', 'sass-loader' ]
+            },
+            {
+                test: helpers.root('src', 'global.scss'),
+                use: [ 'style-loader', 'css-loader', 'sass-loader' ]
             },
             {
                 test: /\.(png|jpe?g|gif|svg|woff|woff2|otf|ttf|eot|ico)$/,
diff --git a/package.json b/package.json
index 5926280..1a18b8b 100644
--- a/package.json
+++ b/package.json
@@ -57,7 +57,7 @@
         "raw-loader": "^0.5.1",
         "reflect-metadata": "^0.1.10",
         "sass-loader": "^6.0.6",
-        "style-loader": "^0.13.1",
+        "style-loader": "^0.18.2",
         "tslint": "~5.7.0",
         "typescript": "~2.5.2",
         "webpack": "~3.4.1",
diff --git a/src/app/app.component.html b/src/app/app.component.html
index 475ec4f..41fd646 100644
--- a/src/app/app.component.html
+++ b/src/app/app.component.html
@@ -1,4 +1,6 @@
 <div class="tyn-app">
+    <h1>App!</h1>
+
     <main>
         <router-outlet></router-outlet>
     </main>
diff --git a/src/app/app.component.scss b/src/app/app.component.scss
index b230984..3ea0e73 100644
--- a/src/app/app.component.scss
+++ b/src/app/app.component.scss
@@ -1,14 +1,5 @@
 @import "../constants";
 
-html, body, h1 {
-    margin: 0;
-    padding: 0;
-}
-
-body {
-    background-color: $primary-bg;
-    color: #ffffff;
-    font-family: $primary-font;
-    font-size: $primary-font-size;
-    padding: 20px;
+h1 {
+	color: purple;
 }
\ No newline at end of file
diff --git a/src/app/app.component.ts b/src/app/app.component.ts
index cb54144..15bd445 100644
--- a/src/app/app.component.ts
+++ b/src/app/app.component.ts
@@ -1,10 +1,9 @@
-import { Component, OnInit, ViewEncapsulation } from "@angular/core";
+import { Component, OnInit } from "@angular/core";
 
 @Component({
     selector: "tyn-app",
     templateUrl: './app.component.html',
-    styleUrls: [ "./app.component.scss" ],
-    encapsulation: ViewEncapsulation.None
+    styleUrls: [ "./app.component.scss" ]
 })
 export class AppComponent implements OnInit {
     
diff --git a/src/constants.scss b/src/constants.scss
index 836ae8b..ca30c5b 100644
--- a/src/constants.scss
+++ b/src/constants.scss
@@ -3,7 +3,7 @@
 $primary-color: #0064ff;
 $primary-color-light: #3f86ff;
 
-$primary-bg: #373737;
+$primary-bg: #ffffff;
 $primary-content-bg: #4b4b4b;
 
 $primary-font: Tahoma, Arial, sans-serif;
diff --git a/src/global.scss b/src/global.scss
new file mode 100644
index 0000000..e04e1c1
--- /dev/null
+++ b/src/global.scss
@@ -0,0 +1,12 @@
+/**
+ * Global Application Styles
+ */
+
+@import "constants";
+
+body {
+	background-color: $primary-bg;
+	color: $primary-color;
+	font-family: $primary-font;
+	font-size: $primary-font-size;
+}
\ No newline at end of file

From 492cbcdd8ad243f2f7e61ceb7d560cec18ec99db Mon Sep 17 00:00:00 2001
From: Tynarus <admin@tynarus.com>
Date: Mon, 11 Sep 2017 20:58:56 -0500
Subject: [PATCH 2/2] Removing unneccessary entry file

---
 config/build/webpack.common.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/config/build/webpack.common.js b/config/build/webpack.common.js
index 2ceb1f4..dd4841a 100644
--- a/config/build/webpack.common.js
+++ b/config/build/webpack.common.js
@@ -6,8 +6,7 @@ module.exports = {
     entry: {
         'polyfills': './src/polyfills.ts',
         'vendor': './src/vendor.ts',
-        'app': './src/main.ts',
-        'styles': [ './src\\global.scss' ]
+        'app': './src/main.ts'
     },
 
     resolve: {