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

[Steven Wilkin]

Include Vanilla CSS framework

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

[Snappy Tarmac (snappydevtarmac)]

Voting does not meet specified criteria. Required: Approve >= 1, Disapprove == 0. Got: 1 Pending.

[Federico Gimenez (fgimenez)]

review: Approve

[Snappy Tarmac (snappydevtarmac)]

The attempt to merge lp:~bartoszopka/webdm/vanilla-framework into lp:webdm failed. Below is the output from the failed tests.

Checking formatting
Installing godeps
Install golint
Obtaining dependencies
update gopkg.in/yaml.v2 failed; trying to fetch newer version
gopkg.in/yaml.v2 now at 49c95bdc21843256fb6c4e0d370a05f24a0bf213
update github.com/davecheney/gmx failed; trying to fetch newer version
github.com/davecheney/gmx now at d765420e7fbaccecb2a38cf2a02701fe3e0888a3
update github.com/davecheney/mdns failed; trying to fetch newer version
github.com/davecheney/mdns now at de174d86a3d3e87bfad9cb66cedd0433380b67b0
update github.com/gosexy/gettext failed; trying to fetch newer version
github.com/gosexy/gettext now at 98b7b91596d20b96909e6b60d57411547dd9959c
update github.com/miekg/dns failed; trying to fetch newer version
github.com/miekg/dns now at 5a357a6fc5e85268b929350aa6423e2d56dcc4ff
update golang.org/x/crypto failed; trying to fetch newer version
golang.org/x/crypto now at 60052bd85f2d91293457e8811b0cf26b773de469
update gopkg.in/check.v1 failed; trying to fetch newer version
gopkg.in/check.v1 now at 64131543e7896d5bcc6bd5a76287eb75ea96c673
update github.com/cheggaaa/pb failed; trying to fetch newer version
github.com/cheggaaa/pb now at e8c7cc515bfde3e267957a3b110080ceed51354e
update github.com/gorilla/context failed; trying to fetch newer version
github.com/gorilla/context now at 50c25fb3b2b3b3cc724e9b6ac75fb44b3bccd0da
update github.com/gorilla/mux failed; trying to fetch newer version
github.com/gorilla/mux now at e444e69cbd2e2e3e0749a2f3c717cec491552bbf
update github.com/mvo5/goconfigparser failed; trying to fetch newer version
github.com/mvo5/goconfigparser now at 26426272dda20cc76aa1fa44286dc743d2972fe8
update github.com/mvo5/uboot-go failed; trying to fetch newer version
github.com/mvo5/uboot-go now at 69978a3e4b05cca9d7cfee489b3453dfed45e72c
update github.com/snapcore/snapd failed; trying to fetch newer version
github.com/snapcore/snapd now at ea2cc34014d0a49c946971ef20acc23e5dd3ca76
Building
Running tests from /mnt/tarmac/tmp/tmp.HbatT4g2Ur/src/launchpad.net/webdm
=== RUN Test
OK: 4 passed
--- PASS: Test (0.00s)
PASS
coverage: 60.0% of statements
ok launchpad.net/webdm/avahi 0.020s coverage: 60.0% of statements
=== RUN Test
OK: 2 passed
--- PASS: Test (0.00s)
PASS
coverage: 15.0% of statements
ok launchpad.net/webdm/cmd/snappyd 0.010s coverage: 15.0% of statements
=== RUN Test
WARNING: cannot create /mnt/tarmac/tmp/check-954290340706597222/1/badDataPath/icons
OK: 14 passed
--- PASS: Test (0.04s)
PASS
coverage: 45.2% of statements
ok launchpad.net/webdm/snappy 0.050s coverage: 45.2% of statements
=== RUN Test
OK: 8 passed
--- PASS: Test (0.41s)
PASS
coverage: 100.0% of statements
ok launchpad.net/webdm/statustracker 0.419s coverage: 100.0% of statements
Running vet
Running lint
Obtaining npm dependencies

> ws@0.4.32 install /mnt/tarmac/tmp/tmp.HbatT4g2Ur/src/launchpad.net/webdm/node_modules/karma/node_modules/socket.io/node_modules/socket.io-client/node_modules/ws
> (node-gyp rebuild 2> builderror.log) || (exit 0)

make: Entering directory `/mnt/tarmac/tmp/tmp.HbatT4g2Ur/src/launchpad.net/webdm/node_modules/karma...

[Snappy Tarmac (snappydevtarmac)]

The attempt to merge lp:~bartoszopka/webdm/vanilla-framework into lp:webdm failed. Below is the output from the failed tests.

Checking formatting
Installing godeps
Install golint
Obtaining dependencies
update github.com/mvo5/goconfigparser failed; trying to fetch newer version
github.com/mvo5/goconfigparser now at 26426272dda20cc76aa1fa44286dc743d2972fe8
update github.com/gosexy/gettext failed; trying to fetch newer version
github.com/gosexy/gettext now at 98b7b91596d20b96909e6b60d57411547dd9959c
update github.com/snapcore/snapd failed; trying to fetch newer version
github.com/snapcore/snapd now at ea2cc34014d0a49c946971ef20acc23e5dd3ca76
update golang.org/x/crypto failed; trying to fetch newer version
golang.org/x/crypto now at 60052bd85f2d91293457e8811b0cf26b773de469
update github.com/cheggaaa/pb failed; trying to fetch newer version
github.com/cheggaaa/pb now at e8c7cc515bfde3e267957a3b110080ceed51354e
update github.com/davecheney/mdns failed; trying to fetch newer version
github.com/davecheney/mdns now at de174d86a3d3e87bfad9cb66cedd0433380b67b0
update github.com/gorilla/context failed; trying to fetch newer version
update gopkg.in/yaml.v2 failed; trying to fetch newer version
github.com/gorilla/context now at 50c25fb3b2b3b3cc724e9b6ac75fb44b3bccd0da
gopkg.in/yaml.v2 now at 49c95bdc21843256fb6c4e0d370a05f24a0bf213
update github.com/mvo5/uboot-go failed; trying to fetch newer version
github.com/mvo5/uboot-go now at 69978a3e4b05cca9d7cfee489b3453dfed45e72c
update gopkg.in/check.v1 failed; trying to fetch newer version
gopkg.in/check.v1 now at 64131543e7896d5bcc6bd5a76287eb75ea96c673
update github.com/gorilla/mux failed; trying to fetch newer version
github.com/gorilla/mux now at e444e69cbd2e2e3e0749a2f3c717cec491552bbf
update github.com/davecheney/gmx failed; trying to fetch newer version
github.com/davecheney/gmx now at d765420e7fbaccecb2a38cf2a02701fe3e0888a3
update github.com/miekg/dns failed; trying to fetch newer version
github.com/miekg/dns now at 5a357a6fc5e85268b929350aa6423e2d56dcc4ff
Building
Running tests from /mnt/tarmac/tmp/tmp.HlhZCJgVzY/src/launchpad.net/webdm
=== RUN Test
OK: 4 passed
--- PASS: Test (0.00s)
PASS
coverage: 60.0% of statements
ok launchpad.net/webdm/avahi 0.014s coverage: 60.0% of statements
=== RUN Test
OK: 2 passed
--- PASS: Test (0.00s)
PASS
coverage: 15.0% of statements
ok launchpad.net/webdm/cmd/snappyd 0.034s coverage: 15.0% of statements
=== RUN Test
WARNING: cannot create /mnt/tarmac/tmp/check-6631102675490585426/1/badDataPath/icons
OK: 14 passed
--- PASS: Test (0.01s)
PASS
coverage: 45.2% of statements
ok launchpad.net/webdm/snappy 0.017s coverage: 45.2% of statements
=== RUN Test
OK: 8 passed
--- PASS: Test (0.41s)
PASS
coverage: 100.0% of statements
ok launchpad.net/webdm/statustracker 0.418s coverage: 100.0% of statements
Running vet
Running lint
Obtaining npm dependencies

# we always run in a fresh dir in tarmac
export GOPATH=$(mktemp -d -p /mnt/tarmac/tmp); export TMPDIR=/mnt/tarmac/tmp
trap 'rm -rf "$GOPATH"' EXIT

# this is a hack, but not sure tarmac is golang friendly
mkdir -p $GOPATH/src/launchpad.net/webdm
cp -a . $GOPATH/src/launchpad.net/webdm/
cd $GOPATH/src/launchpad....

=== modified file 'gulpfile.js'
--- gulpfile.js	2015-05-26 19:08:26 +0000
+++ gulpfile.js	2016-06-08 07:46:09 +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-08 07:46:09 +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-08 07:46:09 +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-08 07:46:09 +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).
+
+