From 383548799b10d9029e9affefea9baef4ae9d33f0 Mon Sep 17 00:00:00 2001 From: marvin9257 <72580196+marvin9257@users.noreply.github.com> Date: Sun, 26 May 2024 12:31:13 -0500 Subject: [PATCH] fix: missing ship-cargo weights and vehicle-shipping size (#1569) Some fixes per @Kepabar * fix: missing cargo weights on ship * fix: shippingSize on vehicle isn't saved * fix: active Effects edit window has alignment issues --- src/module/data/vehicles.ts | 2 +- src/module/sheets/TwodsixActorSheet.ts | 2 +- src/module/sheets/TwodsixShipSheet.ts | 2 +- static/styles/twodsix.css | 12 ++++++++---- static/styles/twodsix_basic.css | 6 +++--- static/templates/actors/actor-sheet.html | 2 +- static/templates/actors/ship-sheet.html | 2 +- 7 files changed, 16 insertions(+), 12 deletions(-) diff --git a/src/module/data/vehicles.ts b/src/module/data/vehicles.ts index bb271a4c0..e6eb349c7 100644 --- a/src/module/data/vehicles.ts +++ b/src/module/data/vehicles.ts @@ -155,7 +155,7 @@ export class VehicleData extends TwodsixVehicleBaseData { schema.openVehicle = new fields.BooleanField({required: true, initial: false}); schema.traits = new fields.StringField({...requiredBlankString}); schema.weight = new fields.StringField({...requiredBlankString}); - + schema.shippingSize = new fields.StringField({...requiredBlankString}); return schema; } } diff --git a/src/module/sheets/TwodsixActorSheet.ts b/src/module/sheets/TwodsixActorSheet.ts index 6a8e5abc8..fa75c89ed 100644 --- a/src/module/sheets/TwodsixActorSheet.ts +++ b/src/module/sheets/TwodsixActorSheet.ts @@ -129,7 +129,7 @@ export class TwodsixActorSheet extends AbstractTwodsixActorSheet { width: 862, height: 720, resizable: true, - tabs: [{navSelector: ".sheet-tabs", contentSelector: ".sheet-body", initial: "skills"}], + tabs: [{navSelector: ".actor-sheet-tabs", contentSelector: ".sheet-body", initial: "skills"}], scrollY: [".skills", ".inventory", ".finances", ".info", ".effects", ".actor-notes"], dragDrop: [{dragSelector: ".item", dropSelector: null}] }); diff --git a/src/module/sheets/TwodsixShipSheet.ts b/src/module/sheets/TwodsixShipSheet.ts index 7c073b4d8..4ae78078e 100644 --- a/src/module/sheets/TwodsixShipSheet.ts +++ b/src/module/sheets/TwodsixShipSheet.ts @@ -75,7 +75,7 @@ export class TwodsixShipSheet extends AbstractTwodsixActorSheet { width: 825, height: 686, resizable: true, - tabs: [{navSelector: ".sheet-tabs", contentSelector: ".sheet-body", initial: "ship-positions"}], + tabs: [{navSelector: ".actor-sheet-tabs", contentSelector: ".sheet-body", initial: "ship-positions"}], scrollY: [".ship-positions", ".ship-crew", ".ship-component", ".ship-storage", ".storage-wrapper", ".finances", ".ship-notes"], dragDrop: [ //{dropSelector: ".ship-positions-list", dragSelector: ".drag"}, UNKNOWN NEED diff --git a/static/styles/twodsix.css b/static/styles/twodsix.css index e6ea33e4b..810aad7b2 100644 --- a/static/styles/twodsix.css +++ b/static/styles/twodsix.css @@ -276,7 +276,7 @@ table tr:nth-child(even) { margin: 8px 2%; width: 96%; } -.sheet nav.sheet-tabs { +.sheet nav.actor-sheet-tabs { height: 100%; /* flex: 0 0 23px !important; */ margin: 0 !important; @@ -308,7 +308,7 @@ table tr:nth-child(even) { overflow: hidden; } -.sheet nav.sheet-tabs .item { +.sheet nav.actor-sheet-tabs .item { padding: 2px; /* border: none; */ /* border: solid 2px var(--s2d6-default-color); */ @@ -2848,6 +2848,10 @@ a.ship-crew-tab.active, a.ship-positions-tab.active , a.ship-storage-tab.active, justify-content: space-evenly; } +.cargo-weight span.ship-stat.centre { + margin-top: 0; +} + .cargo-list { /*margin-top: 1.1em;*/ /* overflow-y: auto; */ @@ -3685,14 +3689,14 @@ div.app.window-app.minimized.twodsix.ship.actor header a.close { /* TOKEN SHEET */ -.token-sheet .sheet-tabs { +.token-sheet .actor-sheet-tabs { flex: 0 0 32px; border-bottom: 1px solid var(--s2d6-form-light); line-height: 10px; /*width: 32.5em;*/ } -.sheet-tabs { +.actor-sheet-tabs { justify-content: space-around; font-size: 2ch; text-align: center; diff --git a/static/styles/twodsix_basic.css b/static/styles/twodsix_basic.css index b32d34a31..6281c8736 100644 --- a/static/styles/twodsix_basic.css +++ b/static/styles/twodsix_basic.css @@ -1042,7 +1042,7 @@ svg:hover { align-items: center; } -.sheet nav.sheet-tabs{ +.sheet nav.actor-sheet-tabs{ height: auto !important; /* line-height: 100%; */ text-align: center; @@ -1054,7 +1054,7 @@ svg:hover { /* overflow: hidden; */ } -.sheet nav.sheet-tabs .item { +.sheet nav.actor-sheet-tabs .item { padding: 2px; } @@ -2927,7 +2927,7 @@ div.app.window-app.twodsix.ship.actor header a.close { */ /* TOKEN SHEET */ /* -.token-sheet .sheet-tabs { +.token-sheet .actor-sheet-tabs { flex: 0 0 32px; border-bottom: 1px solid var(--form-light); line-height: 28px !important; diff --git a/static/templates/actors/actor-sheet.html b/static/templates/actors/actor-sheet.html index 82fe1b65c..580e22377 100644 --- a/static/templates/actors/actor-sheet.html +++ b/static/templates/actors/actor-sheet.html @@ -67,7 +67,7 @@ {{#unless limited}} {{!-- Sheet Tab Navigation --}}
-