Permalink
Browse files

Move out images from the assets directory.

  • Loading branch information...
tamasd committed Nov 27, 2015
1 parent a295230 commit a86e6e5206f19f50cb7ec8bc019e90ae3cbbe37e
View
@@ -2,7 +2,6 @@ config.json
config.json.*
!config.json.sample
assets/*
!assets/images/
dist
public/*
test.toml
View
@@ -22,15 +22,15 @@
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
<meta charset="utf8" />
<meta name="viewport" content="width=device-width, minimum-scale=1.0, initial-scale=1.0, user-scalable=yes" />
<link rel="shortcut icon" href="/assets/images/favicon.ico" />
<link rel="shortcut icon" href="../images/favicon.ico" />
<title>Walkhub</title>
<link rel="apple-touch-icon" sizes="114x114" href="/assets/images/apple-touch-icon-114x114-precomposed.png" />
<link rel="apple-touch-icon" sizes="120x120" href="/assets/images/apple-touch-icon-120x120-precomposed.png" />
<link rel="apple-touch-icon" sizes="144x144" href="/assets/images/apple-touch-icon-144x144-precomposed.png" />
<link rel="apple-touch-icon" sizes="152x152" href="/assets/images/apple-touch-icon-152x152-precomposed.png" />
<link rel="apple-touch-icon" sizes="57x57" href="/assets/images/apple-touch-icon-57x57-precomposed.png" />
<link rel="apple-touch-icon" sizes="72x72" href="/assets/images/apple-touch-icon-72x72-precomposed.png" />
<link rel="apple-touch-icon" sizes="76x76" href="/assets/images/apple-touch-icon-76x76-precomposed.png" />
<link rel="apple-touch-icon" sizes="114x114" href="../images/apple-touch-icon-114x114-precomposed.png" />
<link rel="apple-touch-icon" sizes="120x120" href="../images/apple-touch-icon-120x120-precomposed.png" />
<link rel="apple-touch-icon" sizes="144x144" href="../images/apple-touch-icon-144x144-precomposed.png" />
<link rel="apple-touch-icon" sizes="152x152" href="../images/apple-touch-icon-152x152-precomposed.png" />
<link rel="apple-touch-icon" sizes="57x57" href="../images/apple-touch-icon-57x57-precomposed.png" />
<link rel="apple-touch-icon" sizes="72x72" href="../images/apple-touch-icon-72x72-precomposed.png" />
<link rel="apple-touch-icon" sizes="76x76" href="../images/apple-touch-icon-76x76-precomposed.png" />
</head>
<body>
<div id="content"></div>
File renamed without changes.
View
@@ -4,7 +4,7 @@
"build": "webpack --progress --profile --colors",
"watch": "webpack --progress --profile --colors --watch",
"test": "exit 1",
"debug": "webpack --progress --profile --colors --watch --display-chunks --display-reasons --display-error-details --display-modules",
"debug": "webpack --progress --profile --colors --watch --display-chunks --display-reasons --display-error-details --display-modules",
"check": "npm-check -s",
"update": "npm-check -u"
},
@@ -21,6 +21,7 @@
"css-loader": "^0.22",
"file-loader": "^0.8",
"history": "^1.13",
"html-loader": "^0.4.0",
"imports-loader": "^0.6",
"jquery": "^2.1",
"json-loader": "^0.5.4",
@@ -36,7 +37,7 @@
},
"devDependencies": {
"babel-loader": "^5.3",
"html-webpack-plugin": "^2.0",
"html-webpack-plugin": "^2.1.0",
"npm-check": "^4.1.2",
"webpack": "^1.12"
}
View
@@ -23,7 +23,7 @@ var loaders = [
{ test: /\.svg(\?v=\d+\.\d+\.\d+)?$/, loader: "url?limit=10000&mimetype=image/svg+xml" },
{ test: /\.scss$/, loader: "style!css!sass?"+sassIncludePaths },
{ test: /\.sass$/, loader: "style!css!sass?indentedSyntax&"+sassIncludePaths },
{ test: /.*\.(gif|png|jpe?g|svg)$/i, loader: "file?name=[path][name]-[sha512:hash:hex:6].[ext]" }
{ test: /.*\.(gif|png|jpe?g|svg|ico)$/i, loader: "file?name=[name]-[sha512:hash:hex:6].[ext]" }
];
if (serverConfig.contentpages) {
@@ -79,14 +79,16 @@ module.exports = {
}),
new HtmlWebpackPlugin({
inject: true,
template: "html/index.html",
excludeChunks: ["client", "embed"]
template: "html?attrs[]=link:href!html/index.html",
chunks: ["app"],
hash: true
}),
new HtmlWebpackPlugin({
inject: true,
template: "html/start.html",
excludeChunks: ["app", "embed"],
filename: "start.html"
chunks: ["client"],
filename: "start.html",
hash: true
}),
new webpack.DefinePlugin({
WALKHUB_URL: JSON.stringify(serverConfig.baseurl),

0 comments on commit a86e6e5

Please sign in to comment.