ulysses

Merge lp:~stephen-stewart/ulysses/flat-buttons into lp:ulysses

flat-buttons
Merge into trunk

Proposed by Stephen Stewart on 2014-10-09

Status:	Merged
Approved by:	Stephen Stewart on 2014-10-09
Approved revision:	50
Merged at revision:	48
Proposed branch:	lp:~stephen-stewart/ulysses/flat-buttons
Merge into:	lp:ulysses
Diff against target:	267 lines (+49/-22) 9 files modified assets/svg-symbols.svg (+5/-0) gulpfile.js (+2/-2) public/buttons.css (+1/-1) public/icons.css (+1/-1) public/ulysses.css (+2/-2) src/buttons.css (+16/-12) src/icons.css (+4/-0) src/icons/caret.svg (+7/-0) test/index.html (+11/-4)
To merge this branch:	bzr merge lp:~stephen-stewart/ulysses/flat-buttons
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
Fabián Ezequiel Gallina (community)		2014-10-09	Approve on 2014-10-09
Review via email: mp+237791@code.launchpad.net

Commit message

remove backgrounds from buttons

Partly because we can't decide if we want flat or not-flat buttons, but mostly because it's better that ues does less.

Description of the change

Partly because we can't decide if we want flat or not-flat buttons, but mostly because it's better that ues does less, remove the backgrounds from buttons.

Revision history for this message

Fabián Ezequiel Gallina (fgallina) wrote on 2014-10-09:

LGTM

review: Approve

Revision history for this message

Ubuntu One Auto Pilot (otto-pilot) wrote on 2014-10-09:

Download full text (15.0 KiB)

The attempt to merge lp:~stephen-stewart/ulysses/flat-buttons into lp:ulysses failed. Below is the output from the failed tests.

> phantomjs@1.9.10 install /mnt/tarmac/cache/ulysses/trunk/node_modules/phantomjs
> node install.js

Download already available at /tmp/phantomjs/phantomjs-1.9.7-linux-x86_64.tar.bz2
Extracting tar contents (via spawned process)
Copying extracted folder /tmp/phantomjs/phantomjs-1.9.7-linux-x86_64.tar.bz2-extract-1412864708905/phantomjs-1.9.7-linux-x86_64 -> /mnt/tarmac/cache/ulysses/trunk/node_modules/phantomjs/lib/phantom
Writing location.js file
Done. Phantomjs binary available at /mnt/tarmac/cache/ulysses/trunk/node_modules/phantomjs/lib/phantom/bin/phantomjs

> safefs@3.0.6 preinstall /mnt/tarmac/cache/ulysses/trunk/node_modules/gulp-replace/node_modules/istextorbinary/node_modules/safefs
> node ./cyclic.js

> taskgroup@3.3.9 preinstall /mnt/tarmac/cache/ulysses/trunk/node_modules/gulp-replace/node_modules/istextorbinary/node_modules/safefs/node_modules/taskgroup
> node ./cyclic.js

> ambi@2.1.6 preinstall /mnt/tarmac/cache/ulysses/trunk/node_modules/gulp-replace/node_modules/istextorbinary/node_modules/safefs/node_modules/taskgroup/node_modules/ambi
> node ./cyclic.js

> typechecker@2.0.8 preinstall /mnt/tarmac/cache/ulysses/trunk/node_modules/gulp-replace/node_modules/istextorbinary/node_modules/safefs/node_modules/taskgroup/node_modules/ambi/node_modules/typechecker
> node ./cyclic.js

normalize.css@3.0.2 node_modules/normalize.css

rework-pure-grids@1.0.0 node_modules/rework-pure-grids

phantomcss@0.7.2 node_modules/phantomcss

purecss@0.5.0 node_modules/purecss

casperjs@1.1.0-beta3 node_modules/casperjs

gulp-csslint@0.1.5 node_modules/gulp-csslint
├── event-stream@3.1.7 (stream-combiner@0.0.4, duplexer@0.1.1, from@0.1.3, pause-stream@0.0.11, map-stream@0.1.0, split@0.2.10, through@2.3.6)
└── csslint@0.10.0 (parserlib@0.2.5)

rework@1.0.1 node_modules/rework
├── convert-source-map@0.3.5
└── css@2.1.0 (inherits@2.0.1, urix@0.1.0, source-map@0.1.40, source-map-resolve@0.3.1)

gulp-autoprefixer@1.0.1 node_modules/gulp-autoprefixer
├── object-assign@1.0.0
├── vinyl-sourcemaps-apply@0.1.4 (source-map@0.1.40)
├── autoprefixer-core@3.1.1 (caniuse-db@1.0.20141008, postcss@2.2.5)
└── through2@0.6.2 (xtend@4.0.0, readable-stream@1.0.33-1)

gulp-rework@1.0.2 node_modules/gulp-rework
├── lodash@2.4.1
└── through2@0.6.2 (xtend@4.0.0, readable-stream@1.0.33-1)

gulp-filter@1.0.2 node_modules/gulp-filter
├── through2@0.6.2 (xtend@4.0.0, readable-stream@1.0.33-1)
└── multimatch@0.3.0 (array-differ@0.1.0, array-union@0.1.0, minimatch@0.3.0)

gulp-ignore@1.2.1 node_modules/gulp-ignore
├── through2@0.6.2 (xtend@4.0.0, readable-stream@1.0.33-1)
└── gulp-match@0.2.1 (minimatch@1.0.0)

del@0.1.3 node_modules/del
├── is-path-cwd@1.0.0
├── rimraf@2.2.8
├── each-async@1.1.0 (onetime@1.0.0, setimmediate@1.0.2)
├── is-path-in-cwd@1.0.0 (is-path-inside@1.0.0)
└── globby@0.1.1 (array-differ@0.1.0, async@0.9.0, array-union@0.1.0, glob@4.0.6)

The attempt to merge lp:~stephen-stewart/ulysses/flat-buttons into lp:ulysses failed. Below is the output from the failed tests.

> phantomjs@1.9.10 install /mnt/tarmac/cache/ulysses/trunk/node_modules/phantomjs
> node install.js

> safefs@3.0.6 preinstall /mnt/tarmac/cache/ulysses/trunk/node_modules/gulp-replace/node_modules/istextorbinary/node_modules/safefs
> node ./cyclic.js

> taskgroup@3.3.9 preinstall /mnt/tarmac/cache/ulysses/trunk/node_modules/gulp-replace/node_modules/istextorbinary/node_modules/safefs/node_modules/taskgroup
> node ./cyclic.js

> ambi@2.1.6 preinstall /mnt/tarmac/cache/ulysses/trunk/node_modules/gulp-replace/node_modules/istextorbinary/node_modules/safefs/node_modules/taskgroup/node_modules/ambi
> node ./cyclic.js

normalize.css@3.0.2 node_modules/normalize.css

rework-pure-grids@1.0.0 node_modules/rework-pure-grids

phantomcss@0.7.2 node_modules/phantomcss

purecss@0.5.0 node_modules/purecss

casperjs@1.1.0-beta3 node_modules/casperjs

rework@1.0.1 node_modules/rework
├── convert-source-map@0.3.5
└── css@2.1.0 (inherits@2.0.1, urix@0.1.0, source-map@0.1.40, source-map-resolve@0.3.1)

gulp-rework@1.0.2 node_modules/gulp-rework
├── lodash@2.4.1
└── through2@0.6.2 (xtend@4.0.0, readable-stream@1.0.33-1)

gulp-filter@1.0.2 node_modules/gulp-filter
├── through2@0.6.2 (xtend@4.0.0, readable-stream@1.0.33-1)
└── multimatch@0.3.0 (array-differ@0.1.0, array-union@0.1.0, minimatch@0.3.0)

gulp-ignore@1.2.1 node_modules/gulp-ignore
├── through2@0.6.2 (xtend@4.0.0, readable-stream@1.0.33-1)
└── gulp-match@0.2.1 (minimatch@1.0.0)

gulp-util@3.0.1 node_modules/gulp-util
├── lodash._reinterpolate@2.4.1
├── dateformat@1.0.8
├── minimist@1.1.0
├── vinyl@0.4.3 (clone-stats@0.0.1)
├── lodash@2.4.1
├── chalk@0.5.1 (escape-string-regexp@1.0.2, ansi-styles@1.1.0, supports-color@0.2.0, has-ansi@0.1.0, strip-ansi@0.3.0)
├── through2@0.6.2 (xtend@4.0.0, readable-stream@1.0.33-1)
├── multipipe@0.1.1 (duplexer2@0.0.2)
└── lodash.template@2.4.1 (lodash._escapestringchar@2.4.1, lodash.values@2.4.1, lodash.templatesettings@2.4.1, lodash.defaults@2.4.1, lodash.keys@2.4.1, lodash.escape@2.4.1)

gulp-csso@0.2.9 node_modules/gulp-csso
├── csso@1.3.11
├── bufferstreams@0.0.2 (readable-stream@1.0.33-1)
└── gulp-util@2.2.20 (lodash._reinterpolate@2.4.1, dateformat@1.0.8, minimist@0.2.0, vinyl@0.2.3, chalk@0.5.1, through2@0.5.1, multipipe@0.1.1, lodash.template@2.4.1)

gulp-concat@2.4.1 node_modules/gulp-concat
├── through@2.3.6
├── concat-with-sourcemaps@0.1.5 (source-map@0.1.40)
└── gulp-util@2.2.20 (lodash._reinterpolate@2.4.1, dateformat@1.0.8, minimist@0.2.0, vinyl@0.2.3, chalk@0.5.1, multipipe@0.1.1, through2@0.5.1, lodash.template@2.4.1)

gulp-webserver@0.8.3 node_modules/gulp-webserver
├── proxy-middleware@0.5.1
├── connect-livereload@0.4.0
├── open@0.0.5
├── watch@0.11.0
├── node.extend@1.1.2 (is@2.0.2)
├── connect@3.2.0 (utils-merge@1.0.0, parseurl@1.3.0, finalhandler@0.2.0, debug@2.0.0)
├── through2@0.5.1 (xtend@3.0.0, readable-stream@1.0.33-1)
├── serve-index@1.4.0 (batch@0.5.1, parseurl@1.3.0, debug@2.0.0, accepts@1.1.1, mime-types@2.0.2)
├── serve-static@1.6.4 (utils-merge@1.0.0, escape-html@1.0.1, parseurl@1.3.0, send@0.9.3)
├── tiny-lr@0.1.4 (debug@0.8.1, parseurl@1.3.0, qs@2.2.4, faye-websocket@0.7.3, body-parser@1.8.4)
└── gulp-util@2.2.20 (lodash._reinterpolate@2.4.1, dateformat@1.0.8, minimist@0.2.0, vinyl@0.2.3, chalk@0.5.1, multipipe@0.1.1, lodash.template@2.4.1)

gulp-svg-symbols@0.1.5 node_modules/gulp-svg-symbols
├── consolidate@0.10.0
├── bluebird@2.3.5
├── lodash@2.4.1
├── through2@0.5.1 (xtend@3.0.0, readable-stream@1.0.33-1)
├── mathjs@0.25.0 (decimal.js@3.0.1)
├── svgo@0.4.5 (colors@0.6.2, whet.extend@0.9.9, sax@0.6.0, coa@0.4.1, js-yaml@2.1.3)
└── gulp-util@2.2.20 (lodash._reinterpolate@2.4.1, dateformat@1.0.8, minimist@0.2.0, vinyl@0.2.3, chalk@0.5.1, multipipe@0.1.1, lodash.template@2.4.1)

phantomjs@1.9.10 node_modules/phantomjs
├── which@1.0.5
├── progress@1.1.8
├── rimraf@2.2.8
├── ncp@0.6.0
├── kew@0.4.0
├── adm-zip@0.4.4
├── request-progress@0.3.1 (throttleit@0.0.2)
├── mkdirp@0.5.0 (minimist@0.0.8)
├── npmconf@2.0.9 (uid-number@0.0.5, inherits@2.0.1, osenv@0.1.0, ini@1.3.0, semver@4.0.3, nopt@3.0.1, config-chain@1.1.8, once@1.3.1)
└── request@2.42.0 (caseless@0.6.0, json-stringify-safe@5.0.0, aws-sign2@0.5.0, forever-agent@0.5.2, stringstream@0.0.4, oauth-sign@0.4.0, tunnel-agent@0.4.0, node-uuid@1.4.1, qs@1.2.2, mime-types@1.0.2, http-signature@0.10.0, bl@0.9.3, form-data@0.1.4, tough-cookie@0.12.1, hawk@1.1.1)

gulp@3.8.8 node_modules/gulp
├── interpret@0.3.7
├── pretty-hrtime@0.2.2
├── deprecated@0.0.1
├── archy@0.0.2
├── minimist@1.1.0
├── semver@3.0.1
├── tildify@1.0.0 (user-home@1.0.0)
├── chalk@0.5.1 (escape-string-regexp@1.0.2, ansi-styles@1.1.0, supports-color@0.2.0, has-ansi@0.1.0, strip-ansi@0.3.0)
├── liftoff@0.12.1 (extend@1.3.0, minimist@0.2.0, resolve@0.7.4, findup-sync@0.1.3)
├── orchestrator@0.3.7 (stream-consume@0.1.0, sequencify@0.0.7, end-of-stream@0.1.5)
└── vinyl-fs@0.3.8 (graceful-fs@3.0.3, strip-bom@1.0.0, mkdirp@0.5.0, through2@0.6.2, vinyl@0.4.3, lodash@2.4.1, glob-stream@3.1.15, glob-watcher@0.0.6)

gulp-replace@0.4.0 node_modules/gulp-replace
├── replacestream@0.1.3 (through@2.3.6)
├── event-stream@3.0.20 (stream-combiner@0.0.4, duplexer@0.1.1, from@0.1.3, pause-stream@0.0.11, map-stream@0.0.4, split@0.2.10, through@2.3.6)
└── istextorbinary@1.0.0 (binaryextensions@1.0.0, textextensions@1.0.0, safefs@3.0.6)
[14:25:19] Using gulpfile ~/cache/ulysses/trunk/gulpfile.js
[14:25:19] Starting 'clean'...
[14:25:19] Finished 'clean' after 4.85 ms
[14:25:19] Starting 'build'...
[14:25:19] 1 error found in /mnt/tarmac/cache/ulysses/trunk/src/normalize.css
[14:25:19] [L95:C1] Outlines should only be modified using :focus. Use of outline: none or outline: 0 should be limited to :focus rules. (outline-none)
[14:25:20] 1 error found in /mnt/tarmac/cache/ulysses/trunk/src/buttons.css
[14:25:20] [L36:C3] Unknown property 'fill'. Properties should be known (listed in CSS3 specification) or be a vendor-prefixed property. (known-properties)
[14:25:21] Finished 'build' after 2.36 s
[14:25:21] Starting 'test'...
[37;46;1mTest file: /mnt/tarmac/cache/ulysses/trunk/test/visual/config/large.js          [0m
Failure! Saved to ./test/visual/failures/large/button_group.fail.png

[37;41;1mFAIL[0m Visual change found for screenshot ./test/visual/results/large/button_group.png (6.65% mismatch)
[33m#    type: fail[0m
[33m#    file: /mnt/tarmac/cache/ulysses/trunk/test/visual/config/large.js[0m
[33m#    subject: false[0m
Failure! Saved to ./test/visual/failures/large/button_toolbar.fail.png

[37;41;1mFAIL[0m Visual change found for screenshot ./test/visual/results/large/button_toolbar.png (2.77% mismatch)
[33m#    type: fail[0m
[33m#    file: /mnt/tarmac/cache/ulysses/trunk/test/visual/config/large.js[0m
[33m#    subject: false[0m

[32;1mPASS[0m No changes found for screenshot ./test/visual/results/large/checkboxes_and_radios.png
Failure! Saved to ./test/visual/failures/large/default_button.fail.png

[37;41;1mFAIL[0m Visual change found for screenshot ./test/visual/results/large/default_button.png (8.97% mismatch)
[33m#    type: fail[0m
[33m#    file: /mnt/tarmac/cache/ulysses/trunk/test/visual/config/large.js[0m
[33m#    subject: false[0m

[32;1mPASS[0m No changes found for screenshot ./test/visual/results/large/default_form.png

[32;1mPASS[0m No changes found for screenshot ./test/visual/results/large/dropdown.png

[32;1mPASS[0m No changes found for screenshot ./test/visual/results/large/full_navbar.png

[32;1mPASS[0m No changes found for screenshot ./test/visual/results/large/grids.png

[32;1mPASS[0m No changes found for screenshot ./test/visual/results/large/headlines.png
Failure! Saved to ./test/visual/failures/large/inline_form.fail.png

[37;41;1mFAIL[0m Visual change found for screenshot ./test/visual/results/large/inline_form.png (0.50% mismatch)
[33m#    type: fail[0m
[33m#    file: /mnt/tarmac/cache/ulysses/trunk/test/visual/config/large.js[0m
[33m#    subject: false[0m

[32;1mPASS[0m No changes found for screenshot ./test/visual/results/large/invert_navbar.png
Failure! Saved to ./test/visual/failures/large/navbar_with_button.fail.png

[37;41;1mFAIL[0m Visual change found for screenshot ./test/visual/results/large/navbar_with_button.png (0.87% mismatch)
[33m#    type: fail[0m
[33m#    file: /mnt/tarmac/cache/ulysses/trunk/test/visual/config/large.js[0m
[33m#    subject: false[0m

[32;1mPASS[0m No changes found for screenshot ./test/visual/results/large/navbar_with_secondary_text.png
Failure! Saved to ./test/visual/failures/large/primary_button.fail.png

[37;41;1mFAIL[0m Visual change found for screenshot ./test/visual/results/large/primary_button.png (18.32% mismatch)
[33m#    type: fail[0m
[33m#    file: /mnt/tarmac/cache/ulysses/trunk/test/visual/config/large.js[0m
[33m#    subject: false[0m

[32;1mPASS[0m No changes found for screenshot ./test/visual/results/large/simple_navbar.png

[32;1mPASS[0m No changes found for screenshot ./test/visual/results/large/tertiary_button.png

PhantomCSS found 16 tests, 6 of them failed.

PhantomCSS has created some images that try to show the difference (in the directory ./test/visual/failures/large). Fuchsia colored pixels indicate a difference betwen the new and old screenshots.
[37;46;1mTest file: /mnt/tarmac/cache/ulysses/trunk/test/visual/config/small.js          [0m
Failure! Saved to ./test/visual/failures/small/button_group.fail.png

[37;41;1mFAIL[0m Visual change found for screenshot ./test/visual/results/large/button_group.png (6.65% mismatch)
[33m#    type: fail[0m
[33m#    file: /mnt/tarmac/cache/ulysses/trunk/test/visual/config/small.js[0m
[33m#    subject: false[0m
Failure! Saved to ./test/visual/failures/small/button_toolbar.fail.png

[32;1mPASS[0m No changes found for screenshot ./test/visual/results/large/checkboxes_and_radios.png
Failure! Saved to ./test/visual/failures/small/default_button.fail.png

[32;1mPASS[0m No changes found for screenshot ./test/visual/results/large/default_form.png

[32;1mPASS[0m No changes found for screenshot ./test/visual/results/large/dropdown.png

[32;1mPASS[0m No changes found for screenshot ./test/visual/results/large/full_navbar.png

[32;1mPASS[0m No changes found for screenshot ./test/visual/results/large/grids.png

[32;1mPASS[0m No changes found for screenshot ./test/visual/results/large/headlines.png
Failure! Saved to ./test/visual/failures/small/inline_form.fail.png

[32;1mPASS[0m No changes found for screenshot ./test/visual/results/large/invert_navbar.png
Failure! Saved to ./test/visual/failures/small/navbar_with_button.fail.png

[32;1mPASS[0m No changes found for screenshot ./test/visual/results/large/navbar_with_secondary_text.png
Failure! Saved to ./test/visual/failures/small/primary_button.fail.png

[32;1mPASS[0m No changes found for screenshot ./test/visual/results/large/simple_navbar.png

[32;1mPASS[0m No changes found for screenshot ./test/visual/results/large/tertiary_button.png

[32;1mPASS[0m No changes found for screenshot ./test/visual/results/small/full_navbar.png

[32;1mPASS[0m No changes found for screenshot ./test/visual/results/small/invert_navbar.png

[32;1mPASS[0m No changes found for screenshot ./test/visual/results/small/simple_navbar.png

PhantomCSS found 19 tests, 6 of them failed.

PhantomCSS has created some images that try to show the difference (in the directory ./test/visual/failures/small). Fuchsia colored pixels indicate a difference betwen the new and old screenshots.

THE END.
[14:26:16] 'test' errored after 55 s
[14:26:16] Error: 6
    at formatError (/mnt/tarmac/cache/ulysses/trunk/node_modules/gulp/bin/gulp.js:161:10)
    at Gulp.<anonymous> (/mnt/tarmac/cache/ulysses/trunk/node_modules/gulp/bin/gulp.js:187:15)
    at Gulp.EventEmitter.emit (events.js:95:17)
    at Gulp.Orchestrator._emitTaskDone (/mnt/tarmac/cache/ulysses/trunk/node_modules/gulp/node_modules/orchestrator/index.js:264:8)
    at /mnt/tarmac/cache/ulysses/trunk/node_modules/gulp/node_modules/orchestrator/index.js:275:23
    at finish (/mnt/tarmac/cache/ulysses/trunk/node_modules/gulp/node_modules/orchestrator/lib/runTask.js:21:8)
    at ChildProcess.cb (/mnt/tarmac/cache/ulysses/trunk/node_modules/gulp/node_modules/orchestrator/lib/runTask.js:29:3)
    at ChildProcess.EventEmitter.emit (events.js:98:17)
    at maybeClose (child_process.js:743:16)
    at Process.ChildProcess._handle.onexit (child_process.js:810:5)

lp:~stephen-stewart/ulysses/flat-buttons updated on 2014-10-09

50. By Stephen Stewart on 2014-10-09: merged over baseline screenshots, creating test failures. gah.

Revision history for this message

Fabián Ezequiel Gallina (fgallina) wrote on 2014-10-09:

LGTM

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk

Subscribers

People subscribed via source and target branches

to all changes:

Stephen Stewart

Ubuntu One hackers

1	=== modified file 'assets/svg-symbols.svg'
2	--- assets/svg-symbols.svg 2014-10-02 14:47:52 +0000
3	+++ assets/svg-symbols.svg 2014-10-09 14:35:47 +0000
4	@@ -1,4 +1,9 @@
5	<svg xmlns="http://www.w3.org/2000/svg" style="display: none;">
6	+ <symbol id="caret" viewBox="0 0 10 7">
7	+ <title>caret icon</title>
8	+ <path d="M10 0L5 7 0 0z"/>
9	+ </symbol>
10	+
11	<symbol id="navbar-menu" viewBox="0 0 36 34">
12	<title>navbar-menu icon</title>
13	<g fill="#DD4814"><path d="M10 16h16v2H10zM10 21h16v2H10zM10 11h16v2H10z"/></g><path fill="#DD4814" d="M24 1c9.87 0 11 1.115 11 10.85v10.3C35 31.885 33.87 33 24 33H12C2.13 33 1 31.885 1 22.15v-10.3C1 2.115 2.13 1 12 1h12m0-1H12C1.63 0 0 1.48 0 11.85v10.3C0 32.52 1.63 34 12 34h12c10.37 0 12-1.48 12-11.85v-10.3C36 1.48 34.37 0 24 0z"/>
14
15	=== modified file 'gulpfile.js'
16	--- gulpfile.js 2014-10-09 13:47:33 +0000
17	+++ gulpfile.js 2014-10-09 14:35:47 +0000
18	@@ -27,7 +27,7 @@
19	gulp.task('update', ['clean', 'copy', 'grids', 'build']);
20	gulp.task('svg', ['symbols']);
21
22	-gulp.task('watch', ['webserver'], function() {
23	+gulp.task('watch', ['build'], function() {
24	gulp.watch(paths.src + '*/.css', ['build']);
25	gulp.watch([paths.normalize, paths.grids], ['copy']);
26	gulp.watch('gulpfile.js', ['grids']);
27	@@ -95,7 +95,7 @@
28	casper.on('close', cb);
29	});
30
31	-gulp.task('webserver', function() {
32	+gulp.task('webserver', ['watch'], function() {
33	gulp.src('.')
34	.pipe(webserver({
35	open: true,
36
37	=== modified file 'public/buttons.css'
38	--- public/buttons.css 2014-09-24 13:23:14 +0000
39	+++ public/buttons.css 2014-10-09 14:35:47 +0000
40	@@ -1,1 +1,1 @@