aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--README.md2
-rw-r--r--bower.json5
-rw-r--r--index.html86
-rw-r--r--package.json8
-rw-r--r--tasks/docsite.js33
5 files changed, 118 insertions, 16 deletions
diff --git a/README.md b/README.md
index 0e1514f..522d6b7 100644
--- a/README.md
+++ b/README.md
@@ -46,7 +46,7 @@ All of the maturity tags can be suffixed with a number, so for example "rc2" is
## Contributing
-We would like nothing more than getting the community involved, and welcome any form of contributions – comments and questions on different communication channels, issues and pull request in the repositories, and anything that you build and share using our elements.
+We would absolutely love to get the community involved, and we welcome any form of contributions – comments and questions on different communication channels, issues and pull request in the repositories, and anything that you build and share using our elements.
### Get in touch with the team
diff --git a/bower.json b/bower.json
index d9da0fc..7827039 100644
--- a/bower.json
+++ b/bower.json
@@ -25,12 +25,15 @@
],
"dependencies": {
"vaadin-grid": "vaadin/vaadin-grid#~1.0.0",
- "vaadin-combo-box": "vaadin/vaadin-combo-box#1.0.0-beta1",
+ "vaadin-combo-box": "vaadin/vaadin-combo-box#1.0.0-rc1",
"vaadin-icons": "vaadin/vaadin-icons#1.0.0-beta1",
"vaadin-date-picker": "vaadin/vaadin-date-picker#1.0.0-beta1",
"vaadin-upload": "vaadin/vaadin-upload#1.0.0-beta1"
},
"devDependencies": {
+ "web-component-tester": "^4.0.3",
+ "test-fixture": "polymerelements/test-fixture#^1.0.0",
+ "iron-test-helpers": "polymerelements/iron-test-helpers#^1.0.0",
"iron-component-page": "polymerelements/iron-component-page#~1.1.0",
"elements-demo-resources": "vaadin/elements-demo-resources#master",
"components-demo-resources": "vaadin/components-demo-resources#master",
diff --git a/index.html b/index.html
new file mode 100644
index 0000000..3ef7c76
--- /dev/null
+++ b/index.html
@@ -0,0 +1,86 @@
+<!--
+@license
+Copyright (c) 2016 Vaadin Ltd.
+This program is available under Apache License Version 2.0, available at https://vaadin.com/license/
+-->
+<html>
+<head>
+ <meta charset="utf-8">
+ <meta name="viewport" content="width=device-width, initial-scale=1, minimum-scale=1" />
+ <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+
+ <title>Vaadin Core Elements</title>
+
+ <style>
+ body {
+ font: normal normal normal 12pt/1.5 sans-serif;
+ max-width: 48rem;
+ margin: 0 auto;
+ padding: 2rem;
+ }
+
+ nav {
+ text-align: left;
+ }
+
+ nav ul {
+ margin: 0 -1rem;
+ padding: 0;
+ list-style: none;
+ }
+
+ nav li {
+ display: inline-block;
+ vertical-align: top;
+ width: 8rem;
+ padding: 1rem;
+ text-align: center;
+ }
+
+ nav a {
+ display: block;
+ padding: 1rem;
+ background: deepskyblue;
+ color: white;
+ text-decoration: none;
+ -webkit-font-smoothing: antialiased;
+ transition: opacity .5s;
+ }
+
+ nav a:hover {
+ opacity: 0.75;
+ transition: opacity .1s;
+ }
+
+ nav a:first-child {
+ background: gray;
+ padding-top: .75rem;
+ padding-bottom: .75rem;
+ }
+
+
+ </style>
+</head>
+<body>
+ <h1>Vaadin Core Elements</h1>
+ <nav>
+ <ul class="layout horizontal wrap">
+ <li>
+ <a href="../vaadin-grid/">Vaadin<br> Grid</a>
+ <a href="../vaadin-grid/demo/">Demo</a>
+ <li>
+ <a href="../vaadin-combo-box/">Vaadin<br> ComboBox</a>
+ <a href="../vaadin-combo-box/demo/">Demo</a>
+ <li>
+ <a href="../vaadin-date-picker/">Vaadin<br> DatePicker</a>
+ <a href="../vaadin-date-picker/demo/">Demo</a>
+ <li>
+ <a href="../vaadin-upload/">Vaadin<br> Upload</a>
+ <a href="../vaadin-upload/demo/">Demo</a>
+ <li>
+ <a href="../vaadin-icons/">Vaadin<br> Icons</a>
+ <a href="../vaadin-icons/demo/">Demo</a>
+ </ul>
+ </nav>
+</body>
+</html>
diff --git a/package.json b/package.json
index d64af08..e3eaa27 100644
--- a/package.json
+++ b/package.json
@@ -8,15 +8,15 @@
"bower": "latest",
"fs-extra": "latest",
"gulp": "latest",
+ "gulp-add-src": "latest",
"gulp-git": "latest",
"gulp-json-editor": "latest",
"gulp-markdown": "^1.0.0",
- "gulp-rename": "latest",
+ "gulp-modify": "^0.1.1",
+ "gulp-rename": "^1.2.2",
"gulp-replace": "latest",
"gulp-util": "latest",
- "yargs": "latest",
- "gulp-modify": "^0.1.1",
- "gulp-add-src": "latest"
+ "yargs": "latest"
},
"devDependencies": {
"chalk": "latest",
diff --git a/tasks/docsite.js b/tasks/docsite.js
index 139faf3..38b3e65 100644
--- a/tasks/docsite.js
+++ b/tasks/docsite.js
@@ -8,6 +8,7 @@ var gutil = require('gulp-util');
var zip = require('gulp-zip');
var args = require('yargs').argv;
var addsrc = require('gulp-add-src');
+var rename = require('gulp-rename');
var stagingBasePath = config.paths.staging.cdn;
var docPath = config.paths.staging.doc;
@@ -49,17 +50,23 @@ gulp.task('cdn:docsite:core-elements-integrations', function() {
return getDocModifyTask('demo/**', docPath + '/integrations');
});
-var doctasks = ['cdn:docsite:core-elements', 'cdn:docsite:core-elements-integrations'];
+gulp.task('cdn:docsite:core-elements-elements', ['cdn:docsite:bower_components'], function() {
+ var docsPaths = config.coreElements.map(function(c) {
+ return stagingPath + '/' + c + '/docs/**';
+ });
-config.coreElements.forEach(function (n) {
- var task = 'cdn:docsite:' + n;
- doctasks.push(task);
- gulp.task(task, ['cdn:docsite:bower_components'], function(done) {
- var elementDocsite = docPath + '/' + n;
- var elementDemo = stagingPath + '/' + n + '/demo/**';
+ return gulp.src(docsPaths, {base: stagingPath})
+ .pipe(rename(function (path) {
+ path.dirname = path.dirname.replace('/docs', '/'); //leaves docs folders empty.
+ }))
+ .pipe(gulp.dest(docPath + '/'));
+});
- return getDocModifyTask(elementDemo, elementDocsite, n);
- });
+gulp.task('cdn:docsite:vaadin-grid', ['cdn:docsite:bower_components'], function(done) {
+ var elementDocsite = docPath + '/vaadin-grid';
+ var elementDemo = stagingPath + '/vaadin-grid/demo/**';
+
+ return getDocModifyTask(elementDemo, elementDocsite, 'vaadin-grid');
});
function getDocModifyTask(sourceFiles, targetFolder, n) {
@@ -104,7 +111,13 @@ function getDocModifyTask(sourceFiles, targetFolder, n) {
.pipe(gulp.dest(targetFolder));
}
-gulp.task('cdn:docsite:zip', doctasks, function() {
+gulp.task('cdn:docsite:stage', ['cdn:docsite:core-elements',
+ 'cdn:docsite:core-elements-elements',
+ //separate task for vaadin-grid until it uses asciidocs
+ 'cdn:docsite:vaadin-grid',
+ 'cdn:docsite:core-elements-integrations']);
+
+gulp.task('cdn:docsite:zip', ['cdn:docsite:stage'], function() {
var src = docPath + '/**/*';
gutil.log("Creating docsite zip " + docPath + " -> " + rootZip + fileZip);
return gulp.src(src)