diff --git a/app/index.html b/app/index.html index c2369e2c..782acc03 100755 --- a/app/index.html +++ b/app/index.html @@ -18,7 +18,6 @@ -
<%= svgContent %>
diff --git a/app/less/app.less b/app/less/app.less index 599779d2..05fed747 100755 --- a/app/less/app.less +++ b/app/less/app.less @@ -29,12 +29,6 @@ body { margin: 0; padding: 0; font-family: @fStandard; - overflow-x: hidden; - background-image: none; - background-repeat: no-repeat; - background-position: center; - background-attachment: scroll; - background-size: cover; } #main { diff --git a/app/less/list.less b/app/less/list.less index af927859..f0ee1c00 100755 --- a/app/less/list.less +++ b/app/less/list.less @@ -2,20 +2,30 @@ overflow: hidden; padding: 5px; cursor: default; - position: relative; font-size: 0.8em; + min-width: 21em; + text-align: left; + .header { - position: absolute; width: 100%; - height: 1.6em; + margin-bottom: 0.4em; font-family: @fTitle; - color: @primary; + color: @bgBlack; + background-color: @primary-disabled; text-transform: uppercase; + text-align: center; + } + + table { + width: 100%; + text-align: right; + td { + padding-right: 0.5em; + } } .items { - margin-top: 25px; margin-bottom: 10px; clear: both; overflow: hidden; @@ -52,20 +62,4 @@ } } - .summary { - font-family: @fStandard; - overflow: hidden; - text-align: right; - - .item { - float:right; - width: 25% - } - .lbl { - font-family: @fTitle; - color: @primary; - text-transform: uppercase; - } - } - } diff --git a/app/less/modal.less b/app/less/modal.less index 85299bb5..394f9988 100755 --- a/app/less/modal.less +++ b/app/less/modal.less @@ -42,8 +42,8 @@ textarea { &.json { display:block; - width:40em; - height: 10em; + width:50em; + height: 25em; resize: vertical; margin:2em 0; } diff --git a/app/less/outfit.less b/app/less/outfit.less index 1f02638a..2d41bf77 100755 --- a/app/less/outfit.less +++ b/app/less/outfit.less @@ -1,7 +1,7 @@ #outfit { - //width: 62em; - //margin: 0 auto; + width: 64em; + margin: 0 auto; } #overview { @@ -9,11 +9,25 @@ margin: 0; float: left; } + overflow: hidden; +} + +#summary { + .user-select-none(); + width: 100%; + margin-top: 1em; + font-size: 0.8em; + border-collapse: collapse; + + tbody td { + padding: 0 0.5em; + } } #build { float: right; line-height: 2em; + font-size: 0.8em; input { background: none; @@ -38,6 +52,7 @@ } #standard { + margin-right: 0.3em; .slot { clear: left; } @@ -47,20 +62,4 @@ .slot { clear: left; } -} - - -#summary { - .user-select-none(); - margin: 0; - border-collapse: collapse; - - tbody td { - padding: 0 0.5em; - } -} - -.toggle { - cursor: pointer; -} - +} \ No newline at end of file diff --git a/app/less/slot.less b/app/less/slot.less index bb599234..0e8b907e 100755 --- a/app/less/slot.less +++ b/app/less/slot.less @@ -1,7 +1,6 @@ .slot-group { - float: left; - margin: 0.25em; + margin: 1em 0; .user-select-none(); cursor: default; @@ -13,13 +12,15 @@ margin: 0.1em 0; font-size: 0.8em; padding-left: 0.5em; + font-weight: normal; } } .slot { float: left; text-align: left; - width: 20.5em; + width: 21em; + min-height: 2.75em; font-size: 0.75em; margin-top: 0.5em; position: relative; @@ -64,7 +65,7 @@ color: lighten(@primary-bg, 12%); text-align: center; letter-spacing: 0.1em; - line-height: 1.8em; + line-height: 1.7em; } &:hover{ diff --git a/app/less/table.less b/app/less/table.less index d8d33260..757a234c 100755 --- a/app/less/table.less +++ b/app/less/table.less @@ -1,9 +1,7 @@ table { - margin: 0 auto; background-color: @primary-bg; border-spacing: 0; - font-size: 0.8em; cursor: default; a, a:visited { diff --git a/app/less/utilities.less b/app/less/utilities.less index e6a3ac11..3ee05e1d 100755 --- a/app/less/utilities.less +++ b/app/less/utilities.less @@ -29,19 +29,3 @@ -ms-user-select: none; user-select: none; } - -.vertical { - -webkit-transform: rotate(-90deg); - -moz-transform: rotate(-90deg); - -ms-transform: rotate(-90deg); - -o-transform: rotate(-90deg); - transform: rotate(-90deg); - - -webkit-transform-origin: 50% 50%; - -moz-transform-origin: 50% 50%; - -ms-transform-origin: 50% 50%; - -o-transform-origin: 50% 50%; - transform-origin: 50% 50%; - - filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=3); -} \ No newline at end of file diff --git a/app/views/_slot-hardpoint.html b/app/views/_slot-hardpoint.html index 035d71a3..9a6af53a 100755 --- a/app/views/_slot-hardpoint.html +++ b/app/views/_slot-hardpoint.html @@ -1,7 +1,8 @@ -
{{::['U','S','M','L','H'][hp.maxClass]}}
+
{{::['U','S','M','L','H'][hp.maxClass]}}
EMPTY
-
{{hp.c.name || lbl}}
{{hp.c.class}}{{hp.c.rating}}/{{hp.c.mode}}{{hp.c.missile}}
+
{{hp.c.class}}{{hp.c.rating}}/{{hp.c.mode}}{{hp.c.missile}} {{hp.c.name || lbl}}
+
{{hp.c.mass}} T
DMG: {{hp.c.damage}}
DPS: {{hp.c.dps}}
@@ -12,6 +13,6 @@
+{{$r.fRPct(hp.c.shieldmul)}}
{{hp.c.range}} KM
Ammo: {{$r.fCrd(hp.c.clip)}}/{{$r.fCrd(hp.c.ammo)}}
-
{{hp.c.mass}} T
+
diff --git a/app/views/_slot-internal.html b/app/views/_slot-internal.html index a37506db..dcb8e653 100755 --- a/app/views/_slot-internal.html +++ b/app/views/_slot-internal.html @@ -1,8 +1,8 @@
EMPTY
-
{{c.c.name || lbl}}
-
{{c.c.class}}{{c.c.rating}}
+
{{c.c.class}}{{c.c.rating}} {{c.c.name || lbl}}
+
{{c.c.mass || c.c.capacity || '0'}} T
Opt: {{c.c.optmass}} T
Max: {{c.c.maxmass}} T
@@ -15,5 +15,4 @@
{{c.c.range}} KM
Range: {{c.c.rangeRating}}
+{{c.c.armouradd}} Armour
-
{{c.c.mass || c.c.capacity || '0'}} T
\ No newline at end of file diff --git a/app/views/page-outfit.html b/app/views/page-outfit.html index ce163c4d..21e7b4fc 100755 --- a/app/views/page-outfit.html +++ b/app/views/page-outfit.html @@ -1,6 +1,6 @@
-
+

@@ -26,10 +26,13 @@ ManuverabilityMassCargoFuel - ArmourShieldsJump RangeInsuranceCost + ArmourShieldsPowerJump RangeCost - AgilityThrustersBoostUnladenLadenUnladenLaden + AgilitySpeedBoost + UnladenLaden + RetractedDeployed + UnladenLaden @@ -41,27 +44,18 @@ {{fRound(ship.ladenMass)}} T {{fRound(ship.cargoCapacity)}} T {{fRound(ship.fuelCapacity)}} T - {{ship.armourTotal}} ({{ship.armour}} + {{ship.armourAdded}}) - {{fRound(ship.shieldStrength)}} Mj ({{fRPct(ship.shieldMultiplier)}}) + {{ship.armourTotal}} ({{ship.armour}} + {{ship.armourAdded}}) + {{fRound(ship.shieldStrength)}} Mj ({{fRPct(ship.shieldMultiplier)}}) + {{fPwr(ship.powerRetracted)}} MW ({{fPct(ship.powerRetracted/ship.powerAvailable)}}) + {{fPwr(ship.powerDeployed)}} MW ({{fPct(ship.powerDeployed/ship.powerAvailable)}}) {{fRound(ship.unladenJumpRange)}} LY {{fRound(ship.ladenJumpRange)}} LY - {{fCrd(ship.totalCost * insurance.current.pct)}} CR {{fCrd(ship.totalCost)}} CR -
-

HardPoints

-
-
-
-
-
-
-
- -
+

Standard

@@ -85,8 +79,8 @@
{{pp.id}}
Eff: {{pp.c.eff}}
-
Power: {{pp.c.pGen}} MW
-
{{pp.c.mass}} T
+
Power: {{pp.c.pGen}} MW
+
{{pp.c.mass}} T
@@ -160,7 +154,17 @@
-
+
+

HardPoints

+
+
+
+
+
+
+
+ +

Internal Compartments

@@ -170,82 +174,74 @@
-
-
-
Power Use
-
-
-
{{pp.c.class}}{{pp.c.rating}} Power Plant
{{fPwr(pp.c.pGen)}}
-
+
-
-
{{c.c.class}}{{c.c.rating}} {{CArr[$index]}}
{{fPwr(c.c.power)}}
-
- -
-
1H Cargo Scoop
{{fPwr(ship.cargoScoop.c.power)}}
-
- -
-
{{c.c.class}}{{c.c.rating}} {{c.c.name || hgMap[c.c.grp]}}
{{fPwr(c.c.power)}}
-
- -
-
{{c.c.class}}{{c.c.rating}} {{c.c.name || igMap[c.c.grp]}}
{{fPwr(c.c.power)}}
-
+
+
Power Use
+
+
Generated
+
+
{{pp.c.class}}{{pp.c.rating}} Power Plant
{{fPwr(pp.c.pGen)}}
-
-
-
Available
-
{{fPwr(ship.powerAvailable)}} MW
-
-
-
Deployed
-
{{fPwr(ship.powerDeployed)}} MW ({{fPct(ship.powerDeployed/ship.powerAvailable)}})
-
-
-
Retracted
-
{{fPwr(ship.powerRetracted)}} MW ({{fPct(ship.powerRetracted/ship.powerAvailable)}})
-
+
Standard
+
+
{{c.c.class}}{{c.c.rating}} {{CArr[$index]}}
{{fPwr(c.c.power)}}
+
+
+
1H Cargo Scoop
{{fPwr(ship.cargoScoop.c.power)}}
+
+
Hardpoints
+
+
{{c.c.class}}{{c.c.rating}} {{c.c.name || hgMap[c.c.grp]}}
{{fPwr(c.c.power)}}
+
+
Internal
+
+
{{c.c.class}}{{c.c.rating}} {{c.c.name || igMap[c.c.grp]}}
{{fPwr(c.c.power)}}
-
-
Jump Range
-
-
-
-
-
-
Costs
-
-
-
{{ship.name}}
{{fCrd(ship.cost)}}
-
-
-
{{ship.bulkheads.c.name}}
{{fCrd(ship.bulkheads.c.cost)}}
-
-
-
{{c.c.class}}{{c.c.rating}} {{CArr[$index]}}
{{fCrd(c.c.cost)}}
-
-
-
{{c.c.class}}{{c.c.rating}} {{c.c.name || hgMap[c.c.grp]}}
{{fCrd(c.c.cost)}}
-
-
-
{{c.c.class}}{{c.c.rating}} {{c.c.name || igMap[c.c.grp]}}
{{fCrd(c.c.cost)}}
-
-
-
-
-
Total
-
{{fCrd(ship.totalCost)}} CR
-
-
-
Insurance
-
{{fCrd(ship.totalCost * insurance.current.pct)}} CR
-
-
+ + + + + + +
RetractedDeployed
{{fPwr(ship.powerRetracted)}} MW ({{fPct(ship.powerRetracted/ship.powerAvailable)}}){{fPwr(ship.powerDeployed)}} MW ({{fPct(ship.powerDeployed/ship.powerAvailable)}})
+
+ +
+
Jump Range
+
+
+
+
Costs
+
+
+
{{ship.name}}
{{fCrd(ship.cost)}}
+
+
+
{{ship.bulkheads.c.name}}
{{fCrd(ship.bulkheads.c.cost)}}
+
+
+
{{c.c.class}}{{c.c.rating}} {{CArr[$index]}}
{{fCrd(c.c.cost)}}
+
+
+
{{c.c.class}}{{c.c.rating}} {{c.c.name || hgMap[c.c.grp]}}
{{fCrd(c.c.cost)}}
+
+
+
{{c.c.class}}{{c.c.rating}} {{c.c.name || igMap[c.c.grp]}}
{{fCrd(c.c.cost)}}
+
+
+ + + + + + +
InsuranceTotal
{{fCrd(ship.totalCost * insurance.current.pct)}} CR{{fCrd(ship.totalCost)}} CR
+
+
diff --git a/package.json b/package.json index 87208da5..552d5f70 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "coriolis_shipyard", - "version": "0.6.2", + "version": "0.7.0", "repository": { "type": "git", "url": "https://github.com/cmmcleod/coriolis"