From e50bcca7ce2be3697a31891cf6ef48fc1ee48a4b Mon Sep 17 00:00:00 2001 From: Stefan Zermatten Date: Tue, 25 Apr 2017 16:23:16 +0200 Subject: [PATCH 1/3] Made feature uses a text field again Fixes #59 --- .../views/character/features/featureDialog/featureDialog.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rpg-docs/client/views/character/features/featureDialog/featureDialog.html b/rpg-docs/client/views/character/features/featureDialog/featureDialog.html index 77dde01cf..02ea0ccfa 100644 --- a/rpg-docs/client/views/character/features/featureDialog/featureDialog.html +++ b/rpg-docs/client/views/character/features/featureDialog/featureDialog.html @@ -60,8 +60,8 @@ Limit uses {{#if usesSet}} - + + {{> formulaSuffix}} {{else}}
From b4649d8c8723124aef389d420fc5e8098a841e3d Mon Sep 17 00:00:00 2001 From: Stefan Zermatten Date: Tue, 25 Apr 2017 16:59:54 +0200 Subject: [PATCH 2/3] Fixed spacing between "weight carried" and "x lbs" --- rpg-docs/client/views/character/inventory/inventory.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rpg-docs/client/views/character/inventory/inventory.html b/rpg-docs/client/views/character/inventory/inventory.html index 95fa9cb4e..98d725c4d 100644 --- a/rpg-docs/client/views/character/inventory/inventory.html +++ b/rpg-docs/client/views/character/inventory/inventory.html @@ -18,11 +18,11 @@
-
+
Weight Carried
- {{round weightCarried}}lbs + {{round weightCarried}} lbs
From 2a9d170647117d9a745034c474528a8dbcfeb322 Mon Sep 17 00:00:00 2001 From: Stefan Zermatten Date: Tue, 25 Apr 2017 17:12:34 +0200 Subject: [PATCH 3/3] Added spacing between values and units in the inventory closes #44 closes #60 --- rpg-docs/client/globalHelpers/valueString.js | 12 ++++++------ .../inventory/containerDialog/containerDialog.html | 6 +++--- .../client/views/character/inventory/inventory.html | 6 +++--- .../character/inventory/itemDialog/itemDialog.html | 2 +- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/rpg-docs/client/globalHelpers/valueString.js b/rpg-docs/client/globalHelpers/valueString.js index 9321a37e4..67f0a8655 100644 --- a/rpg-docs/client/globalHelpers/valueString.js +++ b/rpg-docs/client/globalHelpers/valueString.js @@ -10,13 +10,13 @@ Template.registerHelper("valueString", function(value) { var resultArray = []; if (gp > 0) { - resultArray.push(gp + "gp"); + resultArray.push(gp + " gp"); } if (sp > 0) { - resultArray.push(sp + "sp"); + resultArray.push(sp + " sp"); } if (cp > 0) { - resultArray.push(cp + "cp"); + resultArray.push(cp + " cp"); } //build string with correct spacing @@ -36,18 +36,18 @@ Template.registerHelper("longValueString", function(value) { //sp var gp = Math.floor(value); if (gp > 0) { - resultArray.push(gp + "gp"); + resultArray.push(gp + " gp"); } //sp var sp = Math.floor(10 * (value % 1)); if (sp > 0 || resultArray.length) { - resultArray.push(sp + "sp"); + resultArray.push(sp + " sp"); } //cp var cp = 10 * ((value * 10) % 1); cp = Math.round(cp * 1000) / 1000; if (cp > 0 || resultArray.length) { - resultArray.push(cp + "cp"); + resultArray.push(cp + " cp"); } //build string with correct spacing diff --git a/rpg-docs/client/views/character/inventory/containerDialog/containerDialog.html b/rpg-docs/client/views/character/inventory/containerDialog/containerDialog.html index e072cb196..fcd52b185 100644 --- a/rpg-docs/client/views/character/inventory/containerDialog/containerDialog.html +++ b/rpg-docs/client/views/character/inventory/containerDialog/containerDialog.html @@ -28,9 +28,9 @@