Merge pull request #2 from cmmcleod/master

Merge back my way.

app/less/app.less

@@ -77,13 +77,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/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

@@ -29,7 +29,7 @@ a.ship {
 
   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/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>

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,

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",
@@ -21,7 +20,7 @@
     "gulp-less": "^3.0.2",
     "gulp-manifest": "0.0.6",
     "gulp-minify-css": "^1.0.0",
-    "gulp-rev-all": "^0.8.18",
+    "gulp-rev-all": "0.8.18",
     "gulp-sourcemaps": "^1.5.1",
     "gulp-svgmin": "^1.1.2",
     "gulp-svgstore": "^5.0.1",