javascript/ionic-framework
1
0
Fork 0
mirror of https://github.com/ionic-team/ionic-framework.git synced 2025-08-20 04:14:21 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '2.0' into windows-mode

Browse Source
This commit is contained in:
Brandy Carney
2016-03-01 14:16:22 -05:00
parent 143616b9b1 5fb1e08347
commit 1d95e6c339
18 changed files with 357 additions and 272 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
gulpfile.js
View File

@ -525,10 +525,6 @@ gulp.task('demos', ['bundle.demos'], function() {
return merge([demosStream, cssStream]);
});
gulp.task('demos.dev', function() {
});
/**
* Builds necessary files for each demo then bundles them using webpack. Unlike
* e2e tests, demos are bundled for performance (but have a slower build).
@ -545,7 +541,7 @@ gulp.task('bundle.demos', ['build.demos', 'transpile', 'copy.libs', 'sass', 'fon
// add our bundle entry, removing previous if necessary
// since config is cached
if (config.entry.length > 4) {
if (config.entry.length > 3) {
config.entry.pop();
}
config.entry.push('./' + file);
@ -637,6 +633,7 @@ function buildDemoSass(isProductionMode) {
(function combineSass() {
gulp.src([
sassVars,
'demos/app.variables.scss',
'demos/app.ios.scss'
])
.pipe(concat('output.ios.scss'))
@ -644,6 +641,7 @@ function buildDemoSass(isProductionMode) {
gulp.src([
sassVars,
'demos/app.variables.scss',
'demos/app.md.scss'
])
.pipe(concat('output.md.scss'))