Merge pull request #5 from cmmcleod/master

Merge back post-responsive priority stuff.

README.md

@@ -1,4 +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)
+
+
 
 ## About
 

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;
+          vertical-align: middle;
-          padding:0;
+          font-size: 1.6em;
-          margin:0;
-          font-size: 2em;
         }
       }
     }
@@ -186,7 +192,7 @@ table.total {
       g.tick:nth-child(2n) text {
         display: none;
       }
-    } 
+    }
 
     table thead tr.main th {
       font-size: 0.8em;

app/views/page-comparison.html

@@ -31,7 +31,7 @@
     <td>
       <ul id="facet-container" as-sortable="facetSortOpts" ng-model="facets" class="sortable" update="tblUpdate">
         <li ng-repeat="(i,f) in facets" as-sortable-item class="facet" ng-class="{active: f.active}" ng-click="toggleFacet(i)">
-          <div as-sortable-item-handle>↔ <span ng-bind="f.title"></span></div>
+          <div as-sortable-item-handle>&#x2194; <span ng-bind="f.title"></span></div>
         </li>
       </ul>
     </td>

app/views/page-outfit.html

@@ -221,7 +221,7 @@
           <td style="width:1em;" ng-click="togglePwr(c)">{{c.c.class}}{{c.c.rating}}</td>
           <td class="le shorten" ng-click="togglePwr(c)" ng-bind="cName(c)"></td>
           <td ng-click="togglePwr(c)"><u  ng-bind="c.type"></u></td>
-          <td><span ng-click="decPriority(c)">&#9668;</span> {{c.priority + 1}} <span ng-click="incPriority(c)">&#9658;</span></td>
+          <td><span ng-click="decPriority(c)" class="flip">&#9658;</span> {{c.priority + 1}} <span ng-click="incPriority(c)">&#9658;</span></td>
           <td class="ri" style="width:3.25em;">{{fPwr(c.c.power)}}</td>
           <td class="ri" style="width:3em;"><u>{{f1Pct(c.c.power/ship.powerAvailable)}}</u></td>
           <td ng-if="!c.enabled" class="disabled" colspan="2">DISABLED</td>

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": [

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']);
 

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",