diff --git a/Torchbearer 2E/src/js/init.js b/Torchbearer 2E/src/js/init.js index 907db008ac91..68f1b3d1812c 100644 --- a/Torchbearer 2E/src/js/init.js +++ b/Torchbearer 2E/src/js/init.js @@ -4,11 +4,11 @@ on("sheet:opened", function (eventinfo) { }); function initializeTabs(values) { - if (!(values['tab'] in ["anatomy", "kit", "magic", "relationships", "levels", "roll"])) { - setAttrs({tab: "anatomy"}); + if (!(["anatomy", "kit", "magic", "relationships", "levels", "roll"].includes(values['tab']))) { + setAttrs({ tab: "anatomy" }); } - if (!(values['edit'] in ["playing", "editing"])) { - setAttrs({edit: "playing"}); + if (!(["playing", "editing"].includes(values['edit']))) { + setAttrs({ edit: "playing" }); } } diff --git a/Torchbearer 2E/src/pug/pages/anatomy/anatomy_mixins.pug b/Torchbearer 2E/src/pug/pages/anatomy/anatomy_mixins.pug index c910c282cec7..57895653ba7c 100644 --- a/Torchbearer 2E/src/pug/pages/anatomy/anatomy_mixins.pug +++ b/Torchbearer 2E/src/pug/pages/anatomy/anatomy_mixins.pug @@ -92,6 +92,7 @@ mixin skill(label, attr, bl) input.sheet-pip-value-flag( name="attr_" + attr + "_bl" type="hidden" + value!="0" ) div BL: +zeroPip(attr + "_bl") diff --git a/Torchbearer 2E/src/scss/anatomy/who_you_are.scss b/Torchbearer 2E/src/scss/anatomy/who_you_are.scss index 842da70e5efe..f563021af53d 100644 --- a/Torchbearer 2E/src/scss/anatomy/who_you_are.scss +++ b/Torchbearer 2E/src/scss/anatomy/who_you_are.scss @@ -6,7 +6,7 @@ .sheet-section-body { display: grid; - grid-template-columns: repeat(auto-fit, minmax(160px, 1fr)); + grid-template-columns: repeat(auto-fit, minmax(150px, 1fr)); gap: 4px; } @@ -18,9 +18,9 @@ flex: 1; display: flex; flex-direction: row; - gap: 8px; + gap: 6px; - & > input { + &>input { flex: 1; width: 100%; } @@ -32,4 +32,4 @@ font-size: 14px; font-weight: bold; } -} +} \ No newline at end of file diff --git a/Torchbearer 2E/src/scss/anatomy/wises.scss b/Torchbearer 2E/src/scss/anatomy/wises.scss index 3fd9939c37d4..6c81f461aec0 100644 --- a/Torchbearer 2E/src/scss/anatomy/wises.scss +++ b/Torchbearer 2E/src/scss/anatomy/wises.scss @@ -29,6 +29,6 @@ .sheet-wise-name { @include grey-border; - height: 20px; + min-height: 20px; } } diff --git a/Torchbearer 2E/torchbearer.css b/Torchbearer 2E/torchbearer.css index 04eb85fa2eb3..4aa1935281ab 100644 --- a/Torchbearer 2E/torchbearer.css +++ b/Torchbearer 2E/torchbearer.css @@ -3358,7 +3358,7 @@ } .ui-dialog .tab-content .charsheet .sheet-wises .sheet-wise-name { border-bottom: 1px solid rgba(150, 150, 150, 0.8); - height: 20px; + min-height: 20px; } .ui-dialog .tab-content .charsheet .sheet-section-header { @@ -5974,7 +5974,7 @@ } .ui-dialog .tab-content .charsheet .sheet-who-you-are .sheet-section-body { display: grid; - grid-template-columns: repeat(auto-fit, minmax(160px, 1fr)); + grid-template-columns: repeat(auto-fit, minmax(150px, 1fr)); gap: 4px; } .ui-dialog .tab-content .charsheet .sheet-who-you-are .sheet-section-column { @@ -5984,7 +5984,7 @@ flex: 1; display: flex; flex-direction: row; - gap: 8px; + gap: 6px; } .ui-dialog .tab-content .charsheet .sheet-who-you-are .sheet-field > input { flex: 1; diff --git a/Torchbearer 2E/torchbearer.html b/Torchbearer 2E/torchbearer.html index 7f5a32f2082f..c3c48be0067b 100644 --- a/Torchbearer 2E/torchbearer.html +++ b/Torchbearer 2E/torchbearer.html @@ -678,7 +678,7 @@