Merge lp:~bartoszopka/snapweb/vanilla-framework into lp:~snappy-dev/snapweb/trunk

[Bartek Szopka]

Example of how Vanilla framework can be included in webdm project to allow loading only chosen modules from vanilla and keep vanilla overrides separate from rest of styles.

[Steven Wilkin (stevenwilkin)]

+1

review: Approve

[Steven Wilkin (stevenwilkin)]

+1

review: Approve

Unmerged revisions

=== modified file 'gulpfile.js'
--- gulpfile.js	2015-05-26 19:08:26 +0000
+++ gulpfile.js	2016-06-07 13:29:23 +0000
@@ -13,6 +13,7 @@
 var imagemin = require('gulp-imagemin');
 var jscs = require('gulp-jscs');
 var jshint = require('gulp-jshint');
+var sass = require('gulp-sass');
 var sourcemaps = require('gulp-sourcemaps');
 var source = require('vinyl-source-stream');
 var uglify = require('gulp-uglify');
@@ -102,8 +103,11 @@
 
   return gulp.src([
     'node_modules/normalize.css/normalize.css',
+    'www/src/css/lib/vanilla-includes.scss',
+    'www/src/css/lib/vanilla-overrides.scss',
     'www/src/css/**/*.css'
   ])
+  .pipe(sass())
   .pipe(sourcemaps.init())
   .pipe(postcss(processors))
   .pipe(csso())

=== modified file 'package.json'
--- package.json	2015-09-25 19:27:33 +0000
+++ package.json	2016-06-07 13:29:23 +0000
@@ -20,6 +20,7 @@
     "gulp-jscs": "~1.4.0",
     "gulp-jshint": "~1.9.4",
     "gulp-postcss": "^5.1.6",
+    "gulp-sass": "^2.3.1",
     "gulp-sourcemaps": "~1.5.0",
     "gulp-uglify": "~1.1.0",
     "gulp-util": "~3.0.4",
@@ -40,6 +41,7 @@
     "postcss-bem-linter": "^0.6.0",
     "postcss-custom-media": "^3.0.0",
     "pretty-bytes": "^2.0.1",
+    "vanilla-framework": "0.0.78",
     "vinyl-buffer": "~1.0.0",
     "vinyl-source-stream": "~1.1.0",
     "watchify": "~3.1.2"

=== added directory 'www/src/css/lib'
=== added file 'www/src/css/lib/vanilla-includes.scss'
--- www/src/css/lib/vanilla-includes.scss	1970-01-01 00:00:00 +0000
+++ www/src/css/lib/vanilla-includes.scss	2016-06-07 13:29:23 +0000
@@ -0,0 +1,26 @@
+/*
+ * Vanilla Framework Includes
+ * ============================
+ */
+
+
+// OVERRIDE VANILLA SETTINGS
+//
+// before including any vanilla styles, override variables from _global_settings.scss
+$brand_color: #fff;
+
+// IMPORT VANILLA
+@import "../../../../node_modules/vanilla-framework/scss/vanilla";
+
+// INCLUDE VANILLA MODULES
+//
+// Only include modules that are used in the app.
+// For a list of available modules see Vanilla source code:
+// https://github.com/ubuntudesign/vanilla-framework/blob/master/scss/_vanilla.scss
+
+@include vf-reset;
+// TODO: add other modules when necessary
+//
+// @include vf-boxes;
+// @include vf-grid;
+

=== added file 'www/src/css/lib/vanilla-overrides.scss'
--- www/src/css/lib/vanilla-overrides.scss	1970-01-01 00:00:00 +0000
+++ www/src/css/lib/vanilla-overrides.scss	2016-06-07 13:29:23 +0000
@@ -0,0 +1,8 @@
+/*
+ * Vanilla Framework Overrides
+ */
+
+// If any styles from vanilla framework need to be overridden, corresponding
+// SCSS rules should be put in this file (not mixed with other styles).
+
+