diff --git a/README.md b/README.md
index a3cb884c..3eed4816 100755
--- a/README.md
+++ b/README.md
@@ -1,4 +1,6 @@
-[](https://waffle.io/cmmcleod/coriolis) [](http://waffle.io/cmmcleod/coriolis)
+[ ](https://codeship.com/projects/85232) [](https://waffle.io/cmmcleod/coriolis) [](http://waffle.io/cmmcleod/coriolis)
+
+
## About
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 |
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": [
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",