10000 Merge pull request #7 from wcoder/update · wcoder/life-calendar@f95a6c7 · GitHub
[go: up one dir, main page]
Skip to content

Commit f95a6c7

Browse files
wcoderwcoder
authored
Merge pull request #7 from wcoder/update
2 parents 3f170db + 7007000 commit f95a6c7

File tree

7 files changed

+3784
-72
lines changed

7 files changed

+3784
-72
lines changed

‎dist/index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
<!DOCTYPE html><html lang=ru prefix="og: http://ogp.me/ns#"><head><meta charset=UTF-8><meta name=viewport content="width=device-width, initial-scale=1"><title>Life calendar</title><meta name=description content="Календарь жизни. Life calendar"><meta name=author content="Евгений Пакало"><meta property=og:title content="Life calendar | Календарь жизни"><meta property=og:description content="Календарь жизни. Life calendar"><meta property=og:url content="https://wcoder.github.io/life-calendar/"><meta property=og:type content=website><meta property=og:site_name content="Life calendar"><meta property=og:locale content=ru_RU><link rel=stylesheet href="styles.min.css?v=1.0"></head><body><div class=container><div class=row><div class="col-md-3 hidden-print" id=calendar-settings><form><div class=form-group><label for=b-date id=lang_set_birthday></label><div id=sdate-picker><select id=sdate-day class=form-control></select><select id=sdate-month class=form-control></select><select id=sdate-year class=form-control></select></div></div><div class=form-group><label for=theme id=lang_set_theme></label><select class=form-control id=theme><option value=0>Dark</option><option value=1>Light</option><option value=2>Red</option></select></div><div class=form-group><label for=lang id=lang_select_lang></label><select class=form-control id=lang><option value=0>Русский</option><option value=1>English</option></select></div><div class=form-group><div><label for id=lang_save_print></label></div><div class=btn-group><a href=# class="btn btn-default" id=lang_save_jpg></a> <a href=# class="btn btn-default" id=lang_save_pdf></a> <a href=# class="btn btn-default" id=lang_print></a></div></div></form></div><div class=col-md-9><div id=calendar-canvas></div></div></div><div class="row hidden-print"><div class=col-md-12><p class=text-center><small>&copy; 2016 <a href="https://wcoder.github.io/">Евгений Пакало</a></small></p></div></div></div><script src="scripts.min.js?v=1.0"></script></body></html>
1+
<!DOCTYPE html><html lang="ru" prefix="og: http://ogp.me/ns#"><head><meta charset="UTF-8"><meta name="viewport" content="width=device-width,initial-scale=1"><title>Life calendar</title><meta name="description" content="Календарь жизни. Life calendar"><meta name="author" content="Евгений Пакало"><meta property="og:title" content="Life calendar | Календарь жизни"><meta property="og:description" content="Календарь жизни. Life calendar"><meta property="og:url" content="https://wcoder.github.io/life-calendar/"><meta property="og:type" content="website"><meta property="og:site_name" content="Life calendar"><meta property="og:locale" content="ru_RU"><link rel="stylesheet" href="styles.min.css?v=1.1"></head><body><div class="container"><div class="row"><div class="col-md-3 hidden-print" id="calendar-settings"><form><div class="form-group"><label for="b-date" id="lang_set_birthday"></label><div id="sdate-picker"><select id="sdate-day" class="form-control"></select> <select id="sdate-month" class="form-control"></select> <select id="sdate-year" class="form-control"></select></div></div><div class="form-group"><label for="theme" id="lang_set_theme"></label> <select class="form-control" id="theme"><option value="0">Dark</option><option value="1">Light</option><option value="2">Red</option></select></div><div class="form-group"><label for="lang" id="lang_select_lang"></label> <select class="form-control" id="lang"><option value="0">Русский</option><option value="1">English</option></select></div><div class="form-group"><div><label for="" id="lang_save_print"></label></div><div class="btn-group"><a href="#" class="btn btn-default" id="lang_save_jpg"></a> <a href="#" class="btn btn-default" id="lang_save_pdf"></a> <a href="#" class="btn btn-default" id="lang_print"></a></div></div></form></div><div class="col-md-9"><div id="calendar-canvas"></div></div></div><div class="row hidden-print"><div class="col-md-12"><p class="text-center"><small>&copy; 2016 <a href="https://wcoder.github.io/">Евгений Пакало</a></small></p></div></div></div><script src="scripts.min.js?v=1.1"></script><!-- Yandex.Metrika counter --><script type="text/javascript">(function(m,e,t,r,i,k,a){m[i]=m[i]||function(){(m[i].a=m[i].a||[]).push(arguments)}; m[i].l=1*new Date();k=e.createElement(t),a=e.getElementsByTagName(t)[0],k.async=1,k.src=r,a.parentNode.insertBefore(k,a)}) (window, document, "script", "https://cdn.jsdelivr.net/npm/yandex-metrica-watch/tag.js", "ym"); ym(49258735, "init", { clickmap:true, trackLinks:true, accurateTrackBounce:true, trackHash:true });</script><noscript><div><img src="https://mc.yandex.ru/watch/49258735" style="position:absolute; left:-9999px;" alt=""></div></noscript><!-- /Yandex.Metrika counter --></body></html>

‎dist/scripts.min.js

Lines changed: 1 addition & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/styles.min.css

Lines changed: 2 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎gulpfile.js

Lines changed: 24 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,16 @@
1-
var gulp = require('gulp');
2-
var runSequence = require('run-sequence');
3-
var clean = require('gulp-clean');
4-
var concat = require('gulp-concat');
5-
var uglify = require('gulp-uglify');
6-
var cssnano = require('gulp-cssnano');
7-
var minifyHTML = require('gulp-minify-html');
1+
const gulp = require('gulp');
2+
const clean = require('gulp-clean');
3+
const concat = require('gulp-concat');
4+
const uglify = require('gulp-uglify');
5+
const cleanCSS = require('gulp-clean-css');
6+
const htmlmin = require('gulp-htmlmin');
87

9-
gulp.task('default', function() {
10-
// place code for your default task here
11-
});
12-
13-
gulp.task('build', function(callback) {
14-
runSequence(
15-
'build-clean',
16-
'build-js',
17-
'build-css',
18-
'build-html',
19-
callback);
20-
});
21-
22-
gulp.task('build-clean', function() {
8+
gulp.task('clean', () => {
239
return gulp.src('dist').pipe(clean());
2410
});
2511

26-
gulp.task('build-js', function() {
27-
gulp.src([
12+
gulp.task('scripts', () => {
13+
return gulp.src([
2814
'src/vendor/jspdf/jspdf.min.js',
2915
'src/vendor/sdate/sdate.js',
3016
'src/js/life-calendar.js',
@@ -35,18 +21,29 @@ gulp.task('build-js', function() {
3521
.pipe(gulp.dest('dist'))
3622
});
3723

38-
gulp.task('build-css', function() {
24+
gulp.task('styles', () => {
3925
return gulp.src([
4026
'src/vendor/bootstrap/css/bootstrap.min.css',
4127
'src/css/main.css'
4228
])
4329
.pipe(concat('styles.min.css'))
44-
.pipe(cssnano())
30+
.pipe(cleanCSS())
4531
.pipe(gulp.dest('dist'));
4632
});
4733

48-
gulp.task('build-html', function() {
34+
gulp.task('html', () => {
4935
return gulp.src('src/index.html')
50-
.pipe(minifyHTML({ empty: true }))
36+
.pipe(htmlmin({ collapseWhitespace: true }))
5137
.pipe(gulp.dest('dist'));
5238
});
39+
40+
gulp.task('build',
41+
gulp.series(
42+
'clean',
43+
'scripts',
44+
'styles',
45+
'html',
46+
)
47+
);
48+
49+
gulp.task('default', gulp.series('build'));

0 commit comments

Comments
 (0)
0