From f6da78f456a5f04268c8b316cc5cb83e29377c17 Mon Sep 17 00:00:00 2001 From: Colin McLeod Date: Wed, 3 Jun 2015 22:56:52 -0700 Subject: [PATCH 1/6] HTML fix for shipyard page --- app/views/page-shipyard.html | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/app/views/page-shipyard.html b/app/views/page-shipyard.html index 4817373e..bee4c612 100755 --- a/app/views/page-shipyard.html +++ b/app/views/page-shipyard.html @@ -3,8 +3,7 @@

-
- {{fCrd(s.properties.cost)}} CR + {{fCrd(s.properties.cost)}} CR \ No newline at end of file From 9f083588cf86c8373e268128fc12b37794f4bd2c Mon Sep 17 00:00:00 2001 From: Colin McLeod Date: Wed, 3 Jun 2015 22:57:17 -0700 Subject: [PATCH 2/6] Removing unecessary dependencies --- package.json | 1 - 1 file changed, 1 deletion(-) diff --git a/package.json b/package.json index 64cf2931..706448e3 100644 --- a/package.json +++ b/package.json @@ -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", From 9e79698906e69aca12787aaee5f8f88dea088123 Mon Sep 17 00:00:00 2001 From: Colin McLeod Date: Wed, 3 Jun 2015 22:57:32 -0700 Subject: [PATCH 3/6] Use Orbitron font less often --- app/less/app.less | 4 ++-- app/less/list.less | 2 +- app/less/shipyard.less | 2 +- app/less/slot.less | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/less/app.less b/app/less/app.less index b123513f..06b1fcd3 100755 --- 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; diff --git a/app/less/list.less b/app/less/list.less index 724ad19f..a4ec720f 100755 --- 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; diff --git a/app/less/shipyard.less b/app/less/shipyard.less index 61d92352..d1adf06a 100755 --- a/app/less/shipyard.less +++ b/app/less/shipyard.less @@ -25,7 +25,7 @@ a.ship { small { color: @warning; - font-family: @fTitle; + font-family: @fStandard; float: left; font-size: 0.8em; margin-right: 2em; diff --git a/app/less/slot.less b/app/less/slot.less index adec165a..28e6b368 100755 --- 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; From 56b1ddd68422cb6fa1566c5240dc8602f843a522 Mon Sep 17 00:00:00 2001 From: Colin McLeod Date: Thu, 4 Jun 2015 21:36:56 -0700 Subject: [PATCH 4/6] Fix to Class 2 burst laser data and outfitting bug --- data/components/hardpoints/burst_laser.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/data/components/hardpoints/burst_laser.json b/data/components/hardpoints/burst_laser.json index dbd749c9..2064bcad 100755 --- 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, From 0d7093e29fde192aacba42133df095f1b3d21ea3 Mon Sep 17 00:00:00 2001 From: Colin McLeod Date: Thu, 4 Jun 2015 22:48:59 -0700 Subject: [PATCH 5/6] Bumping version to 0.10.1 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 706448e3..36b3810a 100644 --- 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" From 4a5992dab722399643359b1eec54e51d6e574a16 Mon Sep 17 00:00:00 2001 From: Colin McLeod Date: Thu, 4 Jun 2015 23:05:43 -0700 Subject: [PATCH 6/6] Gulp-rev-all 0.8.20+ seems to break everything --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 36b3810a..23547cd3 100644 --- a/package.json +++ b/package.json @@ -20,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",