Skip to content

Commit 7266f08

Browse files
author
Quique Fernandez
committed
Fix fonts on webpack
1 parent d8a0d9b commit 7266f08

4 files changed

Lines changed: 40 additions & 41 deletions

File tree

Lines changed: 31 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,41 +1,41 @@
1-
<header class="navbar navbar-light navbar-static-top">
2-
<div class="container">
3-
<div class="row">
4-
<div class="col-sm-10">
5-
<a class="navbar-brand" routerLink="catalog">
6-
<img src="../images/brand.png" />
7-
</a>
8-
</div>
9-
<div class="col-sm-2">
10-
<esh-basket-status></esh-basket-status>
1+
<div class="app">
2+
<header class="navbar navbar-light navbar-static-top">
3+
<div class="container">
4+
<div class="row">
5+
<div class="col-sm-10">
6+
<a class="navbar-brand" routerLink="catalog">
7+
<img src="../images/brand.png" />
8+
</a>
9+
</div>
10+
<div class="col-sm-2">
11+
<esh-basket-status></esh-basket-status>
12+
</div>
1113
</div>
1214
</div>
13-
</div>
14-
</header>
15+
</header>
1516

1617

1718

18-
<!-- component routing placeholder -->
19-
<router-outlet></router-outlet>
19+
<!-- component routing placeholder -->
20+
<router-outlet></router-outlet>
2021

2122

22-
<footer class="app-footer">
23-
<div class="container">
24-
<div class="row">
25-
<div class="col-sm-6">
26-
<br>
27-
<div class="app-footer-brand">
28-
<img src="../images/brand_dark.png" />
23+
<footer class="app-footer">
24+
<div class="container">
25+
<div class="row">
26+
<div class="col-sm-6">
27+
<br>
28+
<div class="app-footer-brand">
29+
<img src="../images/brand_dark.png" />
30+
</div>
31+
</div>
32+
<div class="col-sm-6">
33+
<br>
34+
<br>
35+
<br>
36+
<div class="app-footer-text hidden-xs">e-ShoponContainers. All right reserved</div>
2937
</div>
30-
</div>
31-
<div class="col-sm-6">
32-
<br>
33-
<br>
34-
<br>
35-
<div class="app-footer-text hidden-xs">e-ShoponContainers. All right reserved</div>
3638
</div>
3739
</div>
38-
</div>
39-
</footer>
40-
41-
40+
</footer>
41+
</div>

src/Web/WebSPA/eShopOnContainers.WebSPA/Client/modules/app.component.scss

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,9 @@
1212
src: url("../fonts/Montserrat-Bold.eot?") format("eot"),url("../fonts/Montserrat-Bold.woff") format("woff"),url("../fonts/Montserrat-Bold.ttf") format("truetype"),url("../fonts/Montserrat-Bold.svg#Montserrat") format("svg")
1313
}
1414

15-
body {
16-
padding-top: 80px;
17-
/*padding-bottom: 20px;*/
15+
.app {
1816
font-family: Montserrat,sans-serif;
19-
min-width:480px;
20-
}
2117

22-
.app {
2318
&-footer {
2419
padding-top: 40px;
2520
padding-bottom: 40px;

src/Web/WebSPA/eShopOnContainers.WebSPA/config/webpack.config.js

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ var extractCSS = new ExtractTextPlugin('styles.css');
66
var ForkCheckerPlugin = require('awesome-typescript-loader').ForkCheckerPlugin;
77
var devConfig = require('./webpack.config.dev');
88
var prodConfig = require('./webpack.config.prod');
9+
var CopyWebpackPlugin = require('copy-webpack-plugin');
910
var isDevelopment = process.env.ASPNETCORE_ENVIRONMENT === 'Development';
1011

1112
console.log("==========Dev Mode = " + isDevelopment + " ============" )
@@ -74,6 +75,9 @@ module.exports = merge({
7475
'process.env': {
7576
'ENV': JSON.stringify(process.env.ASPNETCORE_ENVIRONMENT)
7677
}
77-
})
78+
}),
79+
new CopyWebpackPlugin([
80+
{ from: 'Client/fonts', to: 'fonts' }
81+
])
7882
]
7983
}, isDevelopment ? devConfig : prodConfig);

src/Web/WebSPA/eShopOnContainers.WebSPA/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
"angular2",
99
"webpack2",
1010
"typescript2",
11-
"bootstrap4",
11+
"bootstrap4",
1212
"docker"
1313
],
1414
"author": {
@@ -71,11 +71,11 @@
7171
"@types/source-map": "0.1.28",
7272
"@types/uglify-js": "2.6.28",
7373
"@types/webpack": "1.12.35",
74-
"angular2-template-loader": "0.6.0",
7574
"angular2-router-loader": "0.3.4",
75+
"angular2-template-loader": "0.6.0",
7676
"awesome-typescript-loader": "2.2.4",
7777
"codelyzer": "1.0.0-beta.3",
78-
"copy-webpack-plugin": "^4.0.0",
78+
"copy-webpack-plugin": "^4.0.1",
7979
"css": "2.2.1",
8080
"css-loader": "0.25.0",
8181
"es6-promise": "3.2.1",

0 commit comments

Comments
 (0)