Skip to content

Commit 2c44518

Browse files
committed
Bugfix in gulpfile.js
1 parent 4415898 commit 2c44518

File tree

3 files changed

+16
-9
lines changed

3 files changed

+16
-9
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
.DS_Store
33
node_modules/
44
css/
5+
dist/
56
js/
67
functions/
78
img/

gulpfile.js

Lines changed: 15 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ function renderCSS() {
4141

4242
createCSSFiles(screen, 'screen.css', 'screen.min.css');
4343
createCSSFiles(print, 'print.css', 'print.min.css');
44-
createCSSFiles(editor, 'editor.css', 'editor.min.css');
44+
createCSSFiles(editor, 'editor-style.css', 'editor-style.min.css');
4545
return createCSSFiles(rtl, 'rtl.css', 'rtl.min.css');
4646
}
4747

@@ -55,12 +55,7 @@ function compressJS(variable, filename) {
5555
.pipe(gulp.dest('./js/'));
5656
}
5757

58-
59-
gulp.task('stylesheets', function () {
60-
return renderCSS();
61-
})
62-
63-
gulp.task('js', function () {
58+
function renderJS() {
6459
var bootstrap = merge(
6560
gulp.src('node_modules/bootstrap/js/tooltip.js'),
6661
gulp.src('node_modules/bootstrap/js/popover.js')
@@ -78,6 +73,14 @@ gulp.task('js', function () {
7873

7974
return gulp.src(js)
8075
.pipe(gulp.dest('./js/'));
76+
}
77+
78+
gulp.task('stylesheets', function () {
79+
return renderCSS();
80+
})
81+
82+
gulp.task('js', function () {
83+
return renderJS();
8184
})
8285

8386
gulp.task('theme', function () {
@@ -86,14 +89,17 @@ gulp.task('theme', function () {
8689
})
8790

8891
gulp.task('dev', function () {
89-
gulp.watch(watchPaths, gulp.parallel('stylesheets', 'js', 'theme'))
92+
return gulp.watch(watchPaths, gulp.parallel('stylesheets', 'js', 'theme'));
9093
})
9194

9295
gulp.task('make', function () {
9396
renderCSS();
97+
renderJS();
98+
gulp.src('license.txt')
99+
.pipe(gulp.dest('dist/'));
94100
gulp.src('css/*')
95101
.pipe(gulp.dest('dist/css/'));
96-
gulp.src(js)
102+
gulp.src('js/*')
97103
.pipe(gulp.dest('dist/js/'));
98104
return gulp.src(theme)
99105
.pipe(gulp.dest('dist/'));

src/theme/img/screenshot.png

-110 KB
Binary file not shown.

0 commit comments

Comments
 (0)