Merge remote-tracking branch 'origin' into feature/modularise-code

This commit is contained in:
Josh Johnson 2017-09-29 13:05:55 +01:00
commit 8e703b5bfc
2 changed files with 9 additions and 8 deletions

View file

@ -157,6 +157,7 @@
<h2>Single select input</h2>
<label for="choices-single-default">Default</label>
<select class="form-control" data-trigger name="choices-single-default" id="choices-single-default" placeholder="This is a search placeholder">
<option placeholder>This is a placeholder</option>
<option value="Dropdown item 1">Dropdown item 1</option>
<option value="Dropdown item 2">Dropdown item 2</option>
<option value="Dropdown item 3">Dropdown item 3</option>

View file

@ -1,14 +1,14 @@
var webpack = require('webpack');
var WebpackDevServer = require('webpack-dev-server');
var config = require('./webpack.config.dev');
var opn = require('opn');
let webpack = require('webpack');
let WebpackDevServer = require('webpack-dev-server');
let config = require('./webpack.config.dev');
let opn = require('opn');
new WebpackDevServer(webpack(config), {
publicPath: config.output.publicPath,
historyApiFallback: true,
quiet: true, // lets WebpackDashboard do its thing
}).listen(3000, 'localhost', function(err, result) {
}).listen(3001, 'localhost', (err, result) => {
if (err) console.log(err);
opn('http://localhost:3000');
console.log('Listening at localhost:3000');
});
opn('http://localhost:3001');
console.log('Listening at localhost:3001');
});