From bede53d124a166718b60ca695f9300bcdcc7050d Mon Sep 17 00:00:00 2001 From: GianniBortoloBossini Date: Wed, 7 Jun 2017 12:07:37 +0200 Subject: [PATCH 1/3] Added clean dependency to task in gulp file because I had problem with file already existing into build folder --- gulpfile.js | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/gulpfile.js b/gulpfile.js index 2ec429fe..c0667f00 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -66,15 +66,15 @@ gulp.task('clean', function () { return del(['build/*']); }); -gulp.task('fonts', function() { +gulp.task('fonts', ['clean'], function() { return gulp.src('./source/fonts/**/*').pipe(gulp.dest('build/fonts')); }); -gulp.task('images', function() { +gulp.task('images', ['clean'], function() { return gulp.src('./source/images/**/*').pipe(gulp.dest('build/images')); }); -gulp.task('js', function() { +gulp.task('js', ['clean'], function() { var config = readIndexYml(); var libs = [ './source/javascripts/lib/_energize.js', @@ -100,7 +100,7 @@ gulp.task('js', function() { .pipe(gulp.dest('./build/javascripts')); }); -gulp.task('sass', function () { +gulp.task('sass', ['clean'], function () { return gulp.src('./source/stylesheets/*.css.scss') .pipe(sass().on('error', sass.logError)) .pipe(rename({ extname: ''})) @@ -108,7 +108,7 @@ gulp.task('sass', function () { .pipe(gulp.dest('./build/stylesheets')); }); -gulp.task('highlightjs', function () { +gulp.task('highlightjs', ['clean'], function () { var config = readIndexYml(); var path = './node_modules/highlight.js/styles/' + config.highlight_theme + '.css'; return gulp.src(path) @@ -117,7 +117,7 @@ gulp.task('highlightjs', function () { .pipe(gulp.dest('./build/stylesheets')); }); -gulp.task('html', function () { +gulp.task('html', ['clean'], function () { var data = getPageData(); return gulp.src('./source/*.html') .pipe(ejs(data).on('error', gutil.log)) From 412ca13b2e3c2099b3bc6de68a4176421a0cdd66 Mon Sep 17 00:00:00 2001 From: GianniBortoloBossini Date: Wed, 7 Jun 2017 12:13:37 +0200 Subject: [PATCH 2/3] With ./ deploy script fails on Windows --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 2299c8bf..04739a71 100644 --- a/package.json +++ b/package.json @@ -6,7 +6,7 @@ "scripts": { "start": "gulp serve", "build": "gulp", - "deploy": "./deploy.sh" + "deploy": "deploy.sh" }, "repository": { "type": "git", From 336d9bfccfdb2cbe91dadb22b5dff569ba37a92c Mon Sep 17 00:00:00 2001 From: GianniBortoloBossini Date: Wed, 7 Jun 2017 12:21:18 +0200 Subject: [PATCH 3/3] Renamed warning alert box to error and introduced a yellow alert box to represent a warning message --- source/stylesheets/_variables.scss | 3 ++- source/stylesheets/screen.css.scss | 11 ++++++++--- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/source/stylesheets/_variables.scss b/source/stylesheets/_variables.scss index 029862bc..03196385 100644 --- a/source/stylesheets/_variables.scss +++ b/source/stylesheets/_variables.scss @@ -35,7 +35,8 @@ $lang-select-active-bg: $examples-bg; // feel free to change this to blue or som $lang-select-pressed-bg: #111; // color of language tab bg when mouse is pressed $main-bg: #eaf2f6; $aside-notice-bg: #8fbcd4; -$aside-warning-bg: #c97a7e; +$aside-error-bg: #c97a7e; +$aside-warning-bg: #ffffe6; $aside-success-bg: #6ac174; $search-notice-bg: #c97a7e; diff --git a/source/stylesheets/screen.css.scss b/source/stylesheets/screen.css.scss index 730a79d5..4c1f21d3 100644 --- a/source/stylesheets/screen.css.scss +++ b/source/stylesheets/screen.css.scss @@ -476,15 +476,20 @@ html, body { background: $aside-notice-bg; line-height: 1.6; - &.warning { - background-color: $aside-warning-bg; - text-shadow: 0 1px 0 lighten($aside-warning-bg, 15%); + &.error { + background-color: $aside-error-bg; + text-shadow: 0 1px 0 lighten($aside-error-bg, 15%); } &.success { background-color: $aside-success-bg; text-shadow: 0 1px 0 lighten($aside-success-bg, 15%); } + + &.warning { + background-color: $aside-warning-bg; + text-shadow: 0 1px 0 lighten($aside-warning-bg, 15%); + } } aside:before {