Merge branch 'feature/gulping' into develop

gulpfile.js

@@ -1,36 +1,48 @@
-var gulp       = require('gulp'),
-    sass       = require('gulp-sass'),
-    prefix     = require('gulp-autoprefixer'),
-    livereload = require('gulp-livereload');
+var browserSync = require('browser-sync').create(),
+    gulp        = require('gulp'),
+    prefix      = require('gulp-autoprefixer'),
+    sass        = require('gulp-sass'),
+    sourcemaps  = require('gulp-sourcemaps');
 
+var HTML       = 'zinnia/templates/**/*.html',
+    THEME      = 'zinnia/static/zinnia/theme/sass/**/*.scss',
+    DASHBOARD  = 'zinnia/static/zinnia/admin/dashboard/sass/*.scss';
 
 gulp.task('theme', function() {
+  browserSync.notify('Compiling theme, please wait !');
 
-  return gulp.src('zinnia/static/zinnia/theme/sass/**/*.scss')
-         .pipe(sass({errLogToConsole: true}))
+  return gulp.src(THEME)
+         .pipe(sourcemaps.init())
+         .pipe(sass().on('error', sass.logError))
          .pipe(prefix())
-         .pipe(gulp.dest('zinnia/static/zinnia/theme/css'));
+         .pipe(sourcemaps.write())
+         .pipe(gulp.dest('zinnia/static/zinnia/theme/css'))
+         .pipe(browserSync.stream());
 });
 
-gulp.task('admin-dashboard', function() {
+gulp.task('dashboard', function() {
+  browserSync.notify('Compiling dashboard, please wait !');
 
-  return gulp.src('zinnia/static/zinnia/admin/dashboard/sass/*.scss')
-         .pipe(sass({errLogToConsole: true}))
+  return gulp.src(DASHBOARD)
+         .pipe(sourcemaps.init())
+         .pipe(sass().on('error', sass.logError))
          .pipe(prefix())
-         .pipe(gulp.dest('zinnia/static/zinnia/admin/dashboard/css'));
+         .pipe(sourcemaps.write())
+         .pipe(gulp.dest('zinnia/static/zinnia/admin/dashboard/css'))
+         .pipe(browserSync.stream());
 });
 
-gulp.task('watch', function() {
+gulp.task('serve', function() {
 
-  livereload.listen();
+  browserSync.init({
+        proxy: 'localhost:8000',
+        serveStatic: ['zinnia/static']
+  });
 
-  gulp.watch(['zinnia/static/zinnia/**/*',
-              'zinnia/templates/**/*']).on('change', livereload.changed);
-
-  gulp.watch('zinnia/static/zinnia/theme/sass/**/*.scss', ['theme']);
-  gulp.watch('zinnia/static/zinnia/admin/dashboard/sass/*.scss', ['admin-dashboard']);
+  gulp.watch(HTML).on('change', browserSync.reload);
+  gulp.watch(THEME, ['theme']);
+  gulp.watch(DASHBOARD, ['dashboard']);
 
 });
 
-
-gulp.task('default', ['theme', 'admin-dashboard', 'watch']);
+gulp.task('default', ['serve']);

package.json

@@ -1,9 +1,12 @@
 {
   "name": "django-blog-zinnia",
+  "description": "Sass builder for django-blog-zinnia",
+  "private": true,
   "devDependencies": {
-    "gulp": "*",
-    "gulp-sass": "*",
-    "gulp-livereload": "*",
-    "gulp-autoprefixer": "*"
+    "browser-sync": "^2.18.8",
+    "gulp": "^3.9.1",
+    "gulp-autoprefixer": "^3.1.1",
+    "gulp-sass": "^3.1.0",
+    "gulp-sourcemaps": "^2.4.1"
   }
 }

zinnia/static/zinnia/theme/sass/partials/_page.scss

@@ -31,7 +31,7 @@
   sup, sub        { line-height: 0; }
   address         { margin: 0 0 1.5em; font-style: italic; }
   pre, code, tt   { @include fixed-width-text; }
-  pre             { margin: 1.5em 0; white-space: pre; line-height: 110%;
+  pre             { margin: 1.5em 0; white-space: pre-wrap; line-height: 110%;
                     @include cite-text; }
   li ul, li ol    { margin: 0; }
   ul, ol          { margin: 0 1.5em 1.5em 0; padding-left: 1.5em; }