Skip to content
This repository has been archived by the owner on May 8, 2019. It is now read-only.

Some proposal fixes #10

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions gulpfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand All @@ -100,15 +100,15 @@ 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: ''}))
.pipe(gulpif(COMPRESS, cleanCSS()))
.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)
Expand All @@ -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))
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"scripts": {
"start": "gulp serve",
"build": "gulp",
"deploy": "./deploy.sh"
"deploy": "deploy.sh"
},
"repository": {
"type": "git",
Expand Down
3 changes: 2 additions & 1 deletion source/stylesheets/_variables.scss
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
11 changes: 8 additions & 3 deletions source/stylesheets/screen.css.scss
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down