verdnatura/salix
verdnatura
/
salix
3
4
Fork 0
Code Issues Pull Requests 59 Releases Wiki Activity

Merge branch 'master' of ssh://git.verdnatura.es:/var/lib/git/salix

This commit is contained in:
Juan Ferrer Toribio 2017-02-21 13:06:54 +01:00
parent a5fc7cb2e9 33bc79cb70
commit bd486f830f
5 changed files with 21 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
client/core/src/components.js
View File

@ -1,4 +1,5 @@
import './mdl-override.css';
import './styles/fonts/mdi-override.css';
import './watcher/index';
import './paging/index';

BIN
client/core/src/styles/fonts/Material-Design-Icons.woff2 Normal file
View File

Binary file not shown.

6
client/core/src/styles/fonts/mdi-override.css Normal file
View File

@ -0,0 +1,6 @@
@font-face {
font-family: 'Material Icons';
font-style: normal;
font-weight: 400;
src: url('./Material-Design-Icons.woff2') format('woff2');
}

2
services/salix/client/index.ejs
View File

@ -3,7 +3,7 @@
<head>
<meta charset="UTF-8">
<title>Salix</title>
<link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet">
<!-- <link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet"> -->
</head>
<body>
<vn-app id="app"></vn-app>

22
webpack.config.js
View File

@ -25,17 +25,21 @@ var config = {
query: {
presets: ['es2015']
}
},{
},
{
test: /\.html$/,
loader: 'html-loader'
},{
},
{
test: /\.css$/,
loader: 'style-loader!css-loader'
},{
},
{
test: /\.scss$/,
loader: 'style-loader!css-loader!sass-loader'
},{
test: /\.(svg|png|ttf)$/,
},
{
test: /\.(svg|png|ttf|woff|woff2)$/,
loader: 'file-loader'
}
]
@ -56,11 +60,11 @@ var config = {
devtool: 'source-map'
};
if(!devMode) {
config.plugins.push (
if (!devMode) {
config.plugins.push (
new webpack.optimize.UglifyJsPlugin({
minimize: true,
compress: { warnings: false }
minimize: true,
compress: { warnings: false }
})
);
}