Skip to content

Commit 201e135

Browse files
sagalbotsagalbot
committed
- new dedicated development template
- separate environment for developing docs - clear out discarded couscous files - start converting docs markdown
1 parent a8388aa commit 201e135

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

59 files changed

+2371
-1145
lines changed

‎build/webpack.base.conf.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ var projectRoot = path.resolve(__dirname, '../')
55

66
module.exports = {
77
entry: {
8-
app: './src/dev.js'
8+
app: process.argv.indexOf('--docs') > 0 ? './docs/docs.js' : './src/dev.js',
99
},
1010
output: {
1111
path: config.build.assetsRoot,
@@ -20,6 +20,7 @@ module.exports = {
2020
'assets': path.resolve(__dirname, '../docs/assets'),
2121
'mixins': path.resolve(__dirname, '../src/mixins'),
2222
'components': path.resolve(__dirname, '../src/components'),
23+
'docs': path.resolve(__dirname, '../docs'),
2324
'vue$': 'vue/dist/vue.common.js',
2425
}
2526
},

‎build/webpack.dev.conf.js

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ Object.keys(baseWebpackConfig.entry).forEach(function (name) {
1212

1313
module.exports = merge(baseWebpackConfig, {
1414
module: {
15-
loaders: utils.styleLoaders()
15+
loaders: utils.styleLoaders().concat({ test: /\.md$/, loader: "html!markdown" })
1616
},
1717
// eval-source-map is faster for development
1818
devtool: '#eval-source-map',
@@ -27,8 +27,13 @@ module.exports = merge(baseWebpackConfig, {
2727
// https://github.com/ampedandwired/html-webpack-plugin
2828
new HtmlWebpackPlugin({
2929
filename: 'index.html',
30-
template: 'dev.html',
30+
template: process.argv.indexOf('--docs') > 0 ? './docs/docs.html' : 'dev.html',
3131
inject: true
3232
})
33-
]
33+
],
34+
markdownLoader: {
35+
highlight: function (code) {
36+
return require('highlight.js').highlightAuto(code).value;
37+
}
38+
}
3439
})

‎dev.html

Lines changed: 27 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,38 @@
11
<!DOCTYPE html>
22
<html lang="en">
3-
<head>
3+
4+
<head>
45
<meta charset="utf-8">
56
<title>Vue Select Dev</title>
67
<link href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/css/bootstrap.min.css" rel="stylesheet">
78
<!-- <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0-alpha.5/css/bootstrap.min.css"> -->
89
<style>
9-
html,body,#app {
10-
height: 100vh;
11-
}
12-
#app {
13-
display: flex;
14-
align-items: center;
15-
justify-content: center;
16-
}
17-
.select {
18-
width: 25em;
19-
}
10+
html,
11+
body,
12+
#app {
13+
height: 100vh;
14+
}
15+
16+
#app {
17+
display: flex;
18+
flex-direction: column;
19+
align-items: center;
20+
justify-content: center;
21+
}
22+
23+
.v-select {
24+
width: 25em;
25+
margin: 1em;
26+
}
2027
</style>
21-
</head>
22-
<body>
28+
</head>
29+
30+
<body>
2331
<div id="app">
24-
<v-select class="select" multiple taggable v-model="value" :options="options"></v-select>
25-
<!-- <v-select class="select" multiple push-tags taggable :options="[{label: 'Foo', value: 'foo'}]"></v-select> -->
26-
<!-- <v-select class="select" multiple push-tags></v-select> -->
32+
<v-select placeholder="multiple, taggable" multiple taggable :options="options" no-drop></v-select>
33+
<v-select placeholder="multiple, push-tags, taggable" multiple push-tags taggable :options="[{label: 'Foo', value: 'foo'}]"></v-select>
34+
<!-- <v-select placeholder="multiple, push-tags" multiple push-tags></v-select> -->
2735
</div>
28-
</body>
36+
</body>
37+
2938
</html>

‎docs/.couscous/generated/.gitignore

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎docs/.couscous/generated/01_install_and_usage.html

Lines changed: 0 additions & 91 deletions
This file was deleted.

‎docs/.couscous/generated/LICENSE

Lines changed: 0 additions & 18 deletions
This file was deleted.

‎docs/.couscous/generated/css/bootstrap.min.css

Lines changed: 0 additions & 7 deletions
This file was deleted.

‎docs/.couscous/generated/css/font-awesome.min.css

Lines changed: 0 additions & 4 deletions
This file was deleted.

‎docs/.couscous/generated/css/highlight.dark.css

Lines changed: 0 additions & 104 deletions
This file was deleted.

0 commit comments

Comments
 (0)