From 6e9990831d86644c57a5727d7751163ab811272c Mon Sep 17 00:00:00 2001 From: Maverick Date: Thu, 4 Jun 2015 20:29:38 +1000 Subject: [PATCH] More responsive outfitting screen (still work to do though). --- app/less/outfit.less | 29 ++- app/less/slot.less | 12 + app/views/page-outfit.html | 509 +++++++++++++++++++------------------ 3 files changed, 292 insertions(+), 258 deletions(-) diff --git a/app/less/outfit.less b/app/less/outfit.less index c61c1b29..ae75e315 100755 --- a/app/less/outfit.less +++ b/app/less/outfit.less @@ -7,8 +7,8 @@ .tablet({ width: 100%; - min-width: 750px; - font-size: 0.8em; + //min-width: 750px; + //font-size: 0.8em; }); } @@ -22,15 +22,16 @@ } #summary { - .user-select-none(); - width: 100%; - margin: 1em 0; - font-size: 0.8em; - border-collapse: collapse; + overflow-x: auto; + width: 100%; + margin: 1em 0 2em 0; - tbody td { - padding: 0 0.5em; - } + #summaryTable { + .user-select-none(); + width: 100%; + border-collapse: collapse; + font-size: 0.8em; + } } #build { @@ -65,4 +66,12 @@ .slot { clear: left; } +} + +.outfit-button-label { + margin-left: 0.5em; + + @media screen and (max-width: 640px) { + display: none; + } } \ No newline at end of file diff --git a/app/less/slot.less b/app/less/slot.less index adec165a..9bb54733 100755 --- a/app/less/slot.less +++ b/app/less/slot.less @@ -16,6 +16,18 @@ padding-left: 0.5em; font-weight: normal; } + + @media screen and (max-width: 1000px) { + width: 50%; + + h1 { + margin: 1em 0 0 0; + } + } + + @media screen and (max-width: 610px) { + width: 100%; + } } .slot { diff --git a/app/views/page-outfit.html b/app/views/page-outfit.html index 95b95126..fc2b75eb 100755 --- a/app/views/page-outfit.html +++ b/app/views/page-outfit.html @@ -1,257 +1,270 @@
-
-

-
- - - - - -
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
SizeManeouverabilityMassCargoFuelArmourShieldsPowerJump Range
AgilitySpeedBoostUnladenLadenRetractedDeployedUnladenLaden
{{ship.agility}}/10{{fRound(ship.speed)}} m/s{{fRound(ship.boost)}} m/s{{fRound(ship.unladenMass)}} T{{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)}}){{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
- -
-

Standard

-
-
-
8
-
Bulkheads
-
{{ship.bulkheads.c.mass}} T
-
{{ship.bulkheads.c.name}}
-
-
    -
  • Lightweight Alloy
    • -
  • Reinforced Alloy
    • -
  • Military Grade Composite
    • -
  • Mirrored Surface Composite
    • -
  • Reactive Surface Composite
    • -
-
-
-
-
{{::pp.maxClass}}
-
{{pp.id}} Power Plant
-
{{pp.c.mass}} T
-
-
Efficiency: {{pp.c.eff}}
-
Power: {{pp.c.pGen}} MW
-
-
-
-
-
-
{{::th.maxClass}}
-
{{th.id}} Thrusters
-
{{th.c.mass}} T
-
-
Opt: {{th.c.optmass}} T
-
Max: {{th.c.maxmass}} T
-
-
-
-
-
-
{{::fsd.maxClass}}
-
{{fsd.id}} Frame Shift Drive
-
{{fsd.c.mass}} T
-
-
Opt: {{fsd.c.optmass}} T
-
Max Fuel: {{fsd.c.maxfuel}} T
-
-
-
-
-
-
{{::ls.maxClass}}
-
{{ls.id}} Life Support
-
{{ls.c.mass}} T
-
-
Time: {{fTime(ls.c.time)}}
-
-
-
-
-
-
{{::pd.maxClass}}
-
{{pd.id}} Power Distributor
-
{{pd.c.mass}} T
-
-
Wep: {{pd.c.weaponcapacity}} Mj / {{pd.c.weaponrecharge}} MW
-
Sys: {{pd.c.systemcapacity}} Mj / {{pd.c.systemrecharge}} MW
-
Eng: {{pd.c.enginecapacity}} Mj / {{pd.c.enginerecharge}} MW
-
-
-
-
-
-
{{::ss.maxClass}}
-
{{ss.id}} Sensors
-
{{ss.c.mass}} T
-
-
{{ss.c.range}} KM
-
-
-
-
-
-
{{::ft.maxClass}}
-
{{ft.id}} Fuel Tank
-
{{ft.c.capacity}} T
-
-
-
-
- -
-

HardPoints

-
-
-
-
-
-
-
- -
-

Utility Mounts

-
-
-
-
-
-
-
- -
-

Internal Compartments

-
-
-
-
-
-
-
- -
- -
-
Power Use
-
-
Generated
-
-
{{pp.c.class}}{{pp.c.rating}} Power Plant
{{fPwr(pp.c.pGen)}}
-
-
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)}}
-
+
+

+
+ + + + + +
- - - - - - -
RetractedDeployed
{{fPwr(ship.powerRetracted)}} MW ({{fPct(ship.powerRetracted/ship.powerAvailable)}}){{fPwr(ship.powerDeployed)}} MW ({{fPct(ship.powerDeployed/ship.powerAvailable)}})
-
- -
-
Jump Range
-
-
-
- -
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
SizeManeouverabilityMassCargoFuelArmourShieldsPowerJump Range
AgilitySpeedBoostUnladenLadenRetractedDeployedUnladenLaden
{{ship.agility}}/10{{fRound(ship.speed)}} m/s{{fRound(ship.boost)}} m/s{{fRound(ship.unladenMass)}} T{{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)}}){{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
-
-
-
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)}}
-
+
+

Standard

+
+
+
8
+
Bulkheads
+
{{ship.bulkheads.c.mass}} T
+
{{ship.bulkheads.c.name}}
+
+
+
    +
  • Lightweight Alloy
    • +
  • Reinforced Alloy
    • +
  • Military Grade Composite
    • +
  • Mirrored Surface Composite
    • +
  • Reactive Surface Composite
    • +
+
+
+
+
+
{{::pp.maxClass}}
+
{{pp.id}} Power Plant
+
{{pp.c.mass}} T
+
+
Efficiency: {{pp.c.eff}}
+
Power: {{pp.c.pGen}} MW
+
+
+
+
+
+
{{::th.maxClass}}
+
{{th.id}} Thrusters
+
{{th.c.mass}} T
+
+
Opt: {{th.c.optmass}} T
+
Max: {{th.c.maxmass}} T
+
+
+
+
+
+
{{::fsd.maxClass}}
+
{{fsd.id}} Frame Shift Drive
+
{{fsd.c.mass}} T
+
+
Opt: {{fsd.c.optmass}} T
+
Max Fuel: {{fsd.c.maxfuel}} T
+
+
+
+
+
+
{{::ls.maxClass}}
+
{{ls.id}} Life Support
+
{{ls.c.mass}} T
+
+
Time: {{fTime(ls.c.time)}}
+
+
+
+
+
+
{{::pd.maxClass}}
+
{{pd.id}} Power Distributor
+
{{pd.c.mass}} T
+
+
Wep: {{pd.c.weaponcapacity}} Mj / {{pd.c.weaponrecharge}} MW
+
Sys: {{pd.c.systemcapacity}} Mj / {{pd.c.systemrecharge}} MW
+
Eng: {{pd.c.enginecapacity}} Mj / {{pd.c.enginerecharge}} MW
+
+
+
+
+
+
{{::ss.maxClass}}
+
{{ss.id}} Sensors
+
{{ss.c.mass}} T
+
+
{{ss.c.range}} KM
+
+
+
+
+
+
{{::ft.maxClass}}
+
{{ft.id}} Fuel Tank
+
{{ft.c.capacity}} T
+
+
+
+
+ +
+

HardPoints

+
+
+
+
+
+
+
+ +
+

Utility Mounts

+
+
+
+
+
+
+
+ +
+

Internal Compartments

+
+
+
+
+
+
+
+ +
+ +
+
Power Use
+
+
Generated
+
+
{{pp.c.class}}{{pp.c.rating}} Power Plant
{{fPwr(pp.c.pGen)}}
+
+
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)}}
+
+
+ + + + + + + + + +
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
- - - - - - -
InsuranceTotal
{{fCrd(ship.totalCost * insurance.current.pct)}} CR{{fCrd(ship.totalCost)}} CR
-