ayan.poddar/eShopOnContainers
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix fonts on webpack

Browse Source
This commit is contained in:
Quique Fernandez 2016-12-22 16:45:02 +01:00
parent d8a0d9bb66
commit 7266f08048
4 changed files with 47 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

74
src/Web/WebSPA/eShopOnContainers.WebSPA/Client/modules/app.component.html
View File

@ -1,41 +1,41 @@
<header class="navbar navbar-light navbar-static-top"> <div class="app">
<div class="container"> <header class="navbar navbar-light navbar-static-top">
<div class="row"> <div class="container">
<div class="col-sm-10"> <div class="row">
<a class="navbar-brand" routerLink="catalog"> <div class="col-sm-10">
<img src="../images/brand.png" /> <a class="navbar-brand" routerLink="catalog">
</a> <img src="../images/brand.png" />
</div> </a>
<div class="col-sm-2"> </div>
<esh-basket-status></esh-basket-status> <div class="col-sm-2">
</div> <esh-basket-status></esh-basket-status>
</div>
</div>
</header>
<!-- component routing placeholder -->
<router-outlet></router-outlet>
<footer class="app-footer">
<div class="container">
<div class="row">
<div class="col-sm-6">
<br>
<div class="app-footer-brand">
<img src="../images/brand_dark.png" />
</div> </div>
</div> </div>
<div class="col-sm-6"> </div>
<br> </header>
<br>
<br>
<div class="app-footer-text hidden-xs">e-ShoponContainers. All right reserved</div>
<!-- component routing placeholder -->
<router-outlet></router-outlet>
<footer class="app-footer">
<div class="container">
<div class="row">
<div class="col-sm-6">
<br>
<div class="app-footer-brand">
<img src="../images/brand_dark.png" />
</div>
</div>
<div class="col-sm-6">
<br>
<br>
<br>
<div class="app-footer-text hidden-xs">e-ShoponContainers. All right reserved</div>
</div>
</div> </div>
</div> </div>
</div> </footer>
</footer> </div>

9
src/Web/WebSPA/eShopOnContainers.WebSPA/Client/modules/app.component.scss
View File

@ -12,14 +12,9 @@
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") 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")
} }
body {
padding-top: 80px;
/*padding-bottom: 20px;*/
font-family: Montserrat,sans-serif;
min-width:480px;
}
.app { .app {
font-family: Montserrat,sans-serif;
&-footer { &-footer {
padding-top: 40px; padding-top: 40px;
padding-bottom: 40px; padding-bottom: 40px;

6
src/Web/WebSPA/eShopOnContainers.WebSPA/config/webpack.config.js
View File

@ -6,6 +6,7 @@ var extractCSS = new ExtractTextPlugin('styles.css');
var ForkCheckerPlugin = require('awesome-typescript-loader').ForkCheckerPlugin; var ForkCheckerPlugin = require('awesome-typescript-loader').ForkCheckerPlugin;
var devConfig = require('./webpack.config.dev'); var devConfig = require('./webpack.config.dev');
var prodConfig = require('./webpack.config.prod'); var prodConfig = require('./webpack.config.prod');
var CopyWebpackPlugin = require('copy-webpack-plugin');
var isDevelopment = process.env.ASPNETCORE_ENVIRONMENT === 'Development'; var isDevelopment = process.env.ASPNETCORE_ENVIRONMENT === 'Development';
console.log("==========Dev Mode = " + isDevelopment + " ============" ) console.log("==========Dev Mode = " + isDevelopment + " ============" )
@ -74,6 +75,9 @@ module.exports = merge({
'process.env': { 'process.env': {
'ENV': JSON.stringify(process.env.ASPNETCORE_ENVIRONMENT) 'ENV': JSON.stringify(process.env.ASPNETCORE_ENVIRONMENT)
} }
}) }),
new CopyWebpackPlugin([
{ from: 'Client/fonts', to: 'fonts' }
])
] ]
}, isDevelopment ? devConfig : prodConfig); }, isDevelopment ? devConfig : prodConfig);

6
src/Web/WebSPA/eShopOnContainers.WebSPA/package.json
View File

@ -8,7 +8,7 @@
"angular2", "angular2",
"webpack2", "webpack2",
"typescript2", "typescript2",
"bootstrap4", "bootstrap4",
"docker" "docker"
], ],
"author": { "author": {
@ -71,11 +71,11 @@
"@types/source-map": "0.1.28", "@types/source-map": "0.1.28",
"@types/uglify-js": "2.6.28", "@types/uglify-js": "2.6.28",
"@types/webpack": "1.12.35", "@types/webpack": "1.12.35",
"angular2-template-loader": "0.6.0",
"angular2-router-loader": "0.3.4", "angular2-router-loader": "0.3.4",
"angular2-template-loader": "0.6.0",
"awesome-typescript-loader": "2.2.4", "awesome-typescript-loader": "2.2.4",
"codelyzer": "1.0.0-beta.3", "codelyzer": "1.0.0-beta.3",
"copy-webpack-plugin": "^4.0.0", "copy-webpack-plugin": "^4.0.1",
"css": "2.2.1", "css": "2.2.1",
"css-loader": "0.25.0", "css-loader": "0.25.0",
"es6-promise": "3.2.1", "es6-promise": "3.2.1",