Bumping version to 0.10.1

Diamondback Explorer data

app/less/app.less

@@ -76,13 +76,13 @@ h1 {
 
 h2 {
   text-transform: uppercase;
-  font-family: @fTitle;
+  font-family: @fStandard;
   font-size: 1.2em;
 }
 
 h3 {
   text-transform: uppercase;
-  font-family: @fTitle;
+  font-family: @fStandard;
   font-size: 1em;
   margin: 0.2em 0;
   color: @primary;

app/less/header.less

@@ -56,6 +56,18 @@ header {
     &.selected {
         background-color: @bgBlack;
     }
+
+    .menu-item-label {
+        @media screen and (min-width: 541px) {
+            margin-left: 1em;
+        }
+        @media screen and (max-width: 540px) {
+            margin-left: 0.5em;
+        }
+        @media screen and (max-width: 520px) {
+            display: none;
+        }
+    }
   }
 
   .menu-list {

app/less/list.less

@@ -10,7 +10,7 @@
   .header {
     width: 100%;
     margin-bottom: 0.4em;
-    font-family: @fTitle;
+    font-family: @fStandard;
     color: @bgBlack;
     background-color: @primary-disabled;
     text-transform: uppercase;

app/less/shipyard.less

@@ -20,11 +20,12 @@ a.ship {
     width: 100%;
     margin: 0;
     text-align: left;
+    font-size: 1.1em;
   }
 
   small {
     color: @warning;
-    font-family: @fTitle;
+    font-family: @fStandard;
     float: left;
     font-size: 0.8em;
     margin-right: 2em;

app/less/slot.less

@@ -7,7 +7,7 @@
   cursor: default;
 
   h1 {
-    font-family: @fTitle;
+    font-family: @fStandard;
     color: @bgBlack;
     background-color: @primary-disabled;
     text-transform: uppercase;

app/views/_header.html

@@ -7,8 +7,8 @@
 
   <div class="l menu">
     <div class="menu-header" ng-class="{selected: openedMenu=='s'}" ng-click="openMenu($event,'s')">
-      <svg class="icon warning"><use xlink:href="#rocket"></use></svg> Ships
+      <svg class="icon warning"><use xlink:href="#rocket"></use></svg><span class="menu-item-label"> Ships</span>
-    </div>
+</div>
     <div class="menu-list no-wrap" ng-if="openedMenu=='s'">
       <a class="block" ng-repeat="(shipId,ship) in ships" ui-sref-active="active" ui-sref="outfit({shipId:shipId, code:null, bn:null})">{{::ship.properties.name}}</a>
     </div>
@@ -16,7 +16,7 @@
 
   <div class="l menu">
     <div class="menu-header" ng-class="{selected: openedMenu=='b', disabled: !bs.hasBuilds}" ng-click="openMenu($event,'b')">
-      <svg class="icon warning" ng-class="{'warning-disabled': !bs.hasBuilds}"><use xlink:href="#hammer"></use></svg> Builds
+      <svg class="icon warning" ng-class="{'warning-disabled': !bs.hasBuilds}"><use xlink:href="#hammer"></use></svg><span class="menu-item-label"> Builds</span>
     </div>
     <div class="menu-list dbl" ng-if="openedMenu=='b'" ng-click="$event.stopPropagation();">
       <ul ng-repeat="shipId in buildsList">
@@ -30,8 +30,8 @@
 
   <div class="l menu">
     <div class="menu-header" ng-class="{selected: openedMenu=='comp', disabled: !bs.hasBuilds}" ng-click="openMenu($event,'comp')">
-      <svg class="icon warning" ng-class="{'warning-disabled': !bs.hasBuilds}"><use xlink:href="#stats-bars"></use></svg> Compare
+      <svg class="icon warning" ng-class="{'warning-disabled': !bs.hasBuilds}"><use xlink:href="#stats-bars"></use></svg><span class="menu-item-label"> Compare</span>
-    </div>
+</div>
     <div class="menu-list" ng-if="openedMenu=='comp'" ng-click="$event.stopPropagation();" style="white-space: nowrap;">
       <span ng-if="!bs.hasComparisons">None Created</span>
       <a ng-repeat="(name, comp) in allComparisons" ui-sref-active="active" class="block name" ui-sref="compare({name:name})" ng-bind="name"></a>

app/views/page-shipyard.html

@@ -3,8 +3,7 @@
     <h2 ng-bind="s.properties.name"></h2>
     <div class="subtitle">
       <small ng-bind="s.properties.manufacturer"></small>
-      <div class="purpose" ng-bind="SP[s.properties.grp]"></div>
     </div>
-    {{fCrd(s.properties.cost)}} <u>CR</u></span>
+    {{fCrd(s.properties.cost)}} <u>CR</u>
   </a>
 </div>

bower.json

@@ -26,7 +26,7 @@
     "d3-tip": "~0.6.7",
     "ng-sortable": "~1.2.1",
     "lz-string": "~1.4.3",
-    "angular": "!~1.4.0"
+    "angular": "~1.4.0"
   },
   "overrides": {
     "angular": {
@@ -50,5 +50,8 @@
     "ng-sortable": {
       "main": "dist/ng-sortable.min.js"
     }
+  },
+  "resolutions": {
+    "angular": "~1.4.0"
   }
 }

data/components/bulkheads.json

@@ -73,6 +73,43 @@
       "mass": 26
     }
   ],
+  "diamondback_explorer": [
+    {
+      "name": "Lightweight Alloy",
+      "class": 1,
+      "rating": "I",
+      "cost": 0,
+      "mass": 0
+    },
+    {
+      "name": "Reinforced Alloy",
+      "class": 1,
+      "rating": "I",
+      "cost": 800000,
+      "mass": 23
+    },
+    {
+      "name": "Military Grade Composite",
+      "class": 1,
+      "rating": "I",
+      "cost": 1800000,
+      "mass": 47
+    },
+    {
+      "name": "Mirrored Surface Composite",
+      "class": 1,
+      "rating": "I",
+      "cost": 4200000,
+      "mass": 26
+    },
+    {
+      "name": "Reactive Surface Composite",
+      "class": 1,
+      "rating": "I",
+      "cost": 4714000,
+      "mass": 47
+    }
+  ],
   "imperial_courier": [
     {
       "name": "Lightweight Alloy",

data/components/hardpoints/burst_laser.json

@@ -59,7 +59,7 @@
     },
     {
       "id": "7h",
-      "group": "ul",
+      "grp": "ul",
       "class":2,
       "rating":"E",
       "cost": 23000,
@@ -75,7 +75,7 @@
     },
     {
       "id": "7i",
-      "group": "ul",
+      "grp": "ul",
       "class":2,
       "rating":"F",
       "cost": 48500,
@@ -91,7 +91,7 @@
     },
     {
       "id": "7j",
-      "group": "ul",
+      "grp": "ul",
       "class":2,
       "rating":"F",
       "cost": 162800,

data/ships/diamondback_explorer.json

@@ -0,0 +1,72 @@
+{
+  "diamondback_explorer": {
+    "properties": {
+      "grp": "ex",
+      "name": "Diamondback Explorer",
+      "manufacturer": "Lakon",
+      "class": 1,
+      "cost": 2000000,
+      "speed": 242,
+      "boost": 316,
+      "agility": 5,
+      "shields": 115,
+      "armour": 270,
+      "fuelcost": 50,
+      "mass": 298
+    },
+    "slots": {
+      "common": [
+        4,
+        4,
+        5,
+        3,
+        4,
+        3,
+        5
+      ],
+      "hardpoints": [
+        3,
+        2,
+        2,
+        0,
+        0,
+        0,
+        0
+      ],
+      "internal": [
+        4,
+        4,
+        3,
+        3,
+        2
+      ]
+    },
+    "defaults": {
+      "common": [
+        "4E",
+        "4E",
+        "5E",
+        "3E",
+        "4E",
+        "3E",
+        "5C"
+      ],
+      "hardpoints": [
+        0,
+        17,
+        17,
+        0,
+        0,
+        0,
+        0
+      ],
+      "internal": [
+        "49",
+        "02",
+        "01",
+        0,
+        "2h"
+      ]
+    }
+  }
+}

data/ships/type_7_transport.json

@@ -2,7 +2,7 @@
   "type_7_transport": {
     "properties": {
       "grp": "fr",
-      "name": "Type-7 Transport",
+      "name": "Type-7 Transporter",
       "manufacturer": "Lakon",
       "class": 3,
       "cost": 16881511,
@@ -77,4 +77,4 @@
       ]
     }
   }
-}
+}

gulpfile.js

@@ -158,6 +158,17 @@ gulp.task('serve', function(cb) {
   });
 });
 
+// Windows command to launch nginx serv
+gulp.task('serve-win', function(cb) {
+  exec('nginx -p %cd% -c nginx.conf', function (err, stdout, stderr) {
+    if (stderr) {
+      console.warn(stderr);
+      console.warn('Is NGINX already running?\n');
+    }
+    cb();
+  });
+});
+
 gulp.task('serve-stop', function(cb) {
   exec('kill -QUIT $(cat nginx.pid)', function (err, stdout, stderr) {
     if (stderr) console.log(stderr); else cb(err);

package.json

@@ -1,6 +1,6 @@
 {
   "name": "coriolis_shipyard",
-  "version": "0.10.0",
+  "version": "0.10.1",
   "repository": {
     "type": "git",
     "url": "https://github.com/cmmcleod/coriolis"
@@ -9,7 +9,6 @@
   "dependencies": {},
   "devDependencies": {
     "gulp-manifest": "^0.0.6",
-    "angular": "^1.4.0",
     "async": "^0.9.0",
     "del": "^1.1.1",
     "gulp": "^3.8.11",