Add global css

vunb · Nov 8, 2017 · 34fcd19 · 34fcd19
1 parent 03f9593
commit 34fcd19
Show file tree

Hide file tree

Showing 6 changed files with 29 additions and 8 deletions.
diff --git a/app/assets/fonts/Raleway-Regular.woff2 b/app/assets/fonts/Raleway-Regular.woff2
diff --git a/app/global.scss b/app/global.scss
@@ -0,0 +1,10 @@
+@font-face {
+  font-family: 'Raleway';
+  font-style: normal;
+  font-weight: 400;
+  src: local('Raleway'), local('Raleway-Regular'), url('./assets/fonts/Raleway-Regular.woff2') format('woff2');
+}
+
+body{
+  font-family: 'Raleway', sans-serif;
+}
diff --git a/app/index.hbs b/app/index.hbs
@@ -6,7 +6,8 @@
 		<meta name="description" content="Electron Angular Webpack Demo App">
 		<base href="./">
 		<title>Electron Angular Webpack</title>
-	</head>
+        <link rel="stylesheet" href="global.scss">
+    </head>
 
 	<body>
 		<demo-app>Loading ...</demo-app>

diff --git a/app/menu/menu.component.html b/app/menu/menu.component.html
@@ -2,10 +2,6 @@
     Quick Start
 </div>
 
-<div class="button">
-    Action 2
-</div>
-
 <div class="button" routerLink="contributors">
     Contributors
 </div>
diff --git a/app/menu/menu.component.scss b/app/menu/menu.component.scss
@@ -4,17 +4,22 @@
     display: inline-block;
     text-align: center;
 
-    margin-left: 13.5%;
+    margin-left: 10%;
     padding: 15px 0;
     width: 15%;
 
     border: 1px solid #DC1E34;
     border-radius: 15px;
 
+    transition: all 0.3s ease;
+
+    &:nth-child(1){
+      margin-left: 30%;
+    }
+
     &:hover{
       transform: scale(1.1) translateY(-5px);
       cursor: pointer;
-      transition: all 0.3s ease;
     }
   }
 }
diff --git a/webpack.config.js b/webpack.config.js
@@ -87,6 +87,15 @@ let webpackConfig = {
 				loader: 'img-loader'
 			}],
 			exclude: /node_modules/
+		}, {
+			test: /\.hbs$/,
+			exclude: /node_modules/,
+			use: {
+				loader: 'html-loader',
+                options: {
+					attrs: ['img:src', 'link:href']
+				}
+            }
 		}]
 	},
 	// Configure how modules are resolved
@@ -111,7 +120,7 @@ let webpackConfig = {
 	// Customize the webpack build process with additionals plugins
 	plugins: [
 		new htmlWebpackPlugin(indexConfig)
-	]
+	],
 };
 
 // UglifyJs and clean output folder only for prod