Bumping version to 0.10.1

Fix to Class 2 burst laser data and outfitting bug
Use Orbitron font less often
2025-12-10 15:15:34 +00:00 · 2015-06-04 22:48:59 -07:00 · 2015-06-04 21:37:26 -07:00 · 2015-06-03 22:57:32 -07:00 · 2015-06-03 22:57:17 -07:00 · 2015-06-03 22:56:52 -07:00
14 changed files with 154 additions and 20 deletions
--- a/app/less/app.less
+++ b/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;
--- a/app/less/header.less
+++ b/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 {
--- a/app/less/list.less
+++ b/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;
--- a/app/less/shipyard.less
+++ b/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;
--- a/app/less/slot.less
+++ b/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;
--- a/app/views/_header.html
+++ b/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
-    </div>
+      <svg class="icon warning"><use xlink:href="#rocket"></use></svg><span class="menu-item-label"> Ships</span>
+</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
-    </div>
+      <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 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>
--- a/app/views/page-shipyard.html
+++ b/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>
--- a/bower.json
+++ b/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"
  }
 }
--- a/data/components/bulkheads.json
+++ b/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",
--- a/data/components/hardpoints/burst_laser.json
+++ b/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,
--- a/data/ships/diamondback_explorer.json
+++ b/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"
+      ]
+    }
+  }
+}
--- a/data/ships/type_7_transport.json
+++ b/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,
--- a/gulpfile.js
+++ b/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);
--- a/package.json
+++ b/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",
Author	SHA1	Message	Date
Colin McLeod	0d7093e29f	Bumping version to 0.10.1	2015-06-04 22:48:59 -07:00
Colin McLeod	56b1ddd684	Fix to Class 2 burst laser data and outfitting bug	2015-06-04 21:37:26 -07:00
Colin McLeod	9e79698906	Use Orbitron font less often	2015-06-03 22:57:32 -07:00
Colin McLeod	9f083588cf	Removing unecessary dependencies	2015-06-03 22:57:17 -07:00
Colin McLeod	f6da78f456	HTML fix for shipyard page	2015-06-03 22:56:52 -07:00
Colin McLeod	741e8247a9	Merge pull request #43 from Toxicat/diamondback-explorer Diamondback Explorer data	2015-06-03 15:35:38 -07:00
Toxicat	8198fb0391	Diamondback Explorer data - Small reduce on font size, to avoid a line break (should we up a bit the width ?)	2015-06-04 00:29:28 +02:00
Colin McLeod	458fca69f6	Merge pull request #35 from Toxicat/master 👍 Add a command to start nginx in windows environnement	2015-06-03 09:40:42 -07:00
Toxicat	d150cdf2a5	Reset package.json	2015-06-03 18:39:19 +02:00
Colin McLeod	b7d3b94c6c	Merge pull request #39 from Maverick-JM/master Main menu bar "Ships, Builds, Compare", et all is now responsive and …	2015-06-03 09:14:31 -07:00
Colin McLeod	5a8d662ba0	Merge pull request #38 from Toxicat/patch-1 Update Type-7 name to correct an old typo	2015-06-03 09:12:41 -07:00
Maverick	f76aa28d66	Main menu bar "Ships, Builds, Compare", et all is now responsive and should work on regular sized and tiny screens alike now.	2015-06-03 22:21:13 +10:00
PanzerKadaver	fb9654a526	Upadate Type-7 name to correct an old typo According to the screenshot provide by SpyTec in #37, the correct name of the Type-7 is "Type-7 Transporter"	2015-06-03 13:28:42 +02:00
PanzerKadaver	a35fc74542	Update package to compatibility with master	2015-06-03 09:18:12 +02:00
Toxicat	f5639ad74e	Compatibility with #31	2015-05-31 15:39:56 +02:00
Toxicat	3ad698058b	Fix dependencies and commands - Fix 'gulp-scp2' dependencies problem - Add serve-win gulp command (for thoose want to contribute with a windows dev environment)	2015-05-30 14:16:28 +02:00