From ae0b9a8a091be879d71eca6a35ddeee4abd0a789 Mon Sep 17 00:00:00 2001 From: Colin McLeod Date: Thu, 11 Jun 2015 11:14:56 -0700 Subject: [PATCH 1/4] Symbol and responsive tweaks --- app/less/outfit.less | 16 +++++++++++----- app/views/page-comparison.html | 2 +- app/views/page-outfit.html | 2 +- 3 files changed, 13 insertions(+), 7 deletions(-) diff --git a/app/less/outfit.less b/app/less/outfit.less index 809e23bd..2d281c86 100755 --- a/app/less/outfit.less +++ b/app/less/outfit.less @@ -43,6 +43,14 @@ } } +.flip { + display: inline-block; + -moz-transform: scaleX(-1); /* Gecko */ + -o-transform: scaleX(-1); /* Operah */ + -webkit-transform: scaleX(-1); /* webkit */ + transform: scaleX(-1); /* standard */ +} + #build { float: right; line-height: 2em; @@ -170,10 +178,8 @@ table.total { table tbody tr td { &:nth-child(4) { span { - display:inline; - padding:0; - margin:0; - font-size: 2em; + vertical-align: middle; + font-size: 1.6em; } } } @@ -186,7 +192,7 @@ table.total { g.tick:nth-child(2n) text { display: none; } - } + } table thead tr.main th { font-size: 0.8em; diff --git a/app/views/page-comparison.html b/app/views/page-comparison.html index 75160b64..6525af22 100755 --- a/app/views/page-comparison.html +++ b/app/views/page-comparison.html @@ -31,7 +31,7 @@ diff --git a/app/views/page-outfit.html b/app/views/page-outfit.html index 0c1753dd..6c85b872 100644 --- a/app/views/page-outfit.html +++ b/app/views/page-outfit.html @@ -221,7 +221,7 @@ {{c.c.class}}{{c.c.rating}} - ◄ {{c.priority + 1}} ► + ► {{c.priority + 1}} ► {{fPwr(c.c.power)}} {{f1Pct(c.c.power/ship.powerAvailable)}} DISABLED From df77d7680c48013ed67d013e8968fbb3a818ef8d Mon Sep 17 00:00:00 2001 From: Colin McLeod Date: Thu, 11 Jun 2015 11:27:43 -0700 Subject: [PATCH 2/4] Updating Imperial Courirer bulkhead mass --- data/components/bulkheads.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/data/components/bulkheads.json b/data/components/bulkheads.json index 3a8ec791..36642418 100755 --- a/data/components/bulkheads.json +++ b/data/components/bulkheads.json @@ -123,28 +123,28 @@ "class": 1, "rating": "I", "cost": 1017200, - "mass": 4 + "mass": 21 }, { "name": "Military Grade Composite", "class": 1, "rating": "I", "cost": 2288600, - "mass": 8 + "mass": 42 }, { "name": "Mirrored Surface Composite", "class": 1, "rating": "I", "cost": 5408800, - "mass": 8 + "mass": 42 }, { "name": "Reactive Surface Composite", "class": 1, "rating": "I", "cost": 5993700, - "mass": 8 + "mass": 42 } ], "cobra_mk_iii": [ From 456c63fe5549fb8956cf46567ac8febb32c76cb6 Mon Sep 17 00:00:00 2001 From: Colin McLeod Date: Thu, 11 Jun 2015 13:51:28 -0700 Subject: [PATCH 3/4] Changes for Codeship CI --- README.md | 2 ++ gulpfile.js | 8 +++++++- package.json | 1 + 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index a3cb884c..a39d8471 100755 --- a/README.md +++ b/README.md @@ -1,5 +1,7 @@ [![Tasks in Ready](https://badge.waffle.io/cmmcleod/coriolis.png?label=ready&title=Ready)](https://waffle.io/cmmcleod/coriolis) [![Tasks in Progress](https://badge.waffle.io/cmmcleod/coriolis.svg?label=in%20progress&title=In%20Progress)](http://waffle.io/cmmcleod/coriolis) +[ ![Codeship Status for cmmcleod/coriolis](https://codeship.com/projects/637858c0-f2a5-0132-7af7-5ed004d44c71/status?branch=master)](https://codeship.com/projects/85232) + ## About The Coriolis project was inspired by [E:D Shipyard](http://www.edshipyard.com/) and, of course, [Elite Dangerous](http://www.elitedangerous.com). The ultimate goal of Coriolis is to provide rich features to support in-game play and planning while engaging the E:D community to support its development. diff --git a/gulpfile.js b/gulpfile.js index c7a80452..c021e779 100755 --- a/gulpfile.js +++ b/gulpfile.js @@ -244,13 +244,19 @@ gulp.task('test', function () { }); gulp.task('lint', ['js-lint', 'json-lint']); + gulp.task('clean', function (done) { del(['build'], done); }); + gulp.task('build', function (done) { runSequence('clean', ['html2js','jsonToDB'], ['generateIndexHTML','bower','js','less','copy'], done); }); gulp.task('build-cache', function (done) { runSequence('build', 'appcache', done); }); +gulp.task('build-prod', function (done) { runSequence('build', 'cache-bust', 'appcache', done); }); + gulp.task('dev', function (done) { runSequence('build-cache', 'serve','watch', done); }); + gulp.task('deploy', function (done) { cdnHostStr = '//cdn.' + process.env.CORIOLIS_HOST; - runSequence('lint', 'build','cache-bust', 'appcache', 'upload', done); + runSequence('build-prod', 'upload', done); }); + gulp.task('default', ['dev']); diff --git a/package.json b/package.json index e44d7225..e841e408 100644 --- a/package.json +++ b/package.json @@ -6,6 +6,7 @@ "url": "https://github.com/cmmcleod/coriolis" }, "private": true, + "engine": "node >= 0.12.2", "dependencies": {}, "devDependencies": { "async": "^0.9.0", From 604ef890672c80f36b9d7ca60ee8427c7c6b1321 Mon Sep 17 00:00:00 2001 From: Colin McLeod Date: Thu, 11 Jun 2015 13:55:01 -0700 Subject: [PATCH 4/4] Update README.md --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index a39d8471..3eed4816 100755 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ -[![Tasks in Ready](https://badge.waffle.io/cmmcleod/coriolis.png?label=ready&title=Ready)](https://waffle.io/cmmcleod/coriolis) [![Tasks in Progress](https://badge.waffle.io/cmmcleod/coriolis.svg?label=in%20progress&title=In%20Progress)](http://waffle.io/cmmcleod/coriolis) +[ ![Codeship Status for cmmcleod/coriolis](https://codeship.com/projects/637858c0-f2a5-0132-7af7-5ed004d44c71/status?branch=master)](https://codeship.com/projects/85232) [![Tasks in Ready](https://badge.waffle.io/cmmcleod/coriolis.png?label=ready&title=Ready)](https://waffle.io/cmmcleod/coriolis) [![Tasks in Progress](https://badge.waffle.io/cmmcleod/coriolis.svg?label=in%20progress&title=In%20Progress)](http://waffle.io/cmmcleod/coriolis) + -[ ![Codeship Status for cmmcleod/coriolis](https://codeship.com/projects/637858c0-f2a5-0132-7af7-5ed004d44c71/status?branch=master)](https://codeship.com/projects/85232) ## About