diff --git a/rpg-docs/client/style/main.scss b/rpg-docs/client/style/main.scss index 2a6ce72b..4d570b23 100644 --- a/rpg-docs/client/style/main.scss +++ b/rpg-docs/client/style/main.scss @@ -146,3 +146,15 @@ paper-button { .clickable, core-item, paper-tab { cursor: pointer; } + +.pre-wrap, .prewrap{ + white-space: pre-wrap; +} + +.padded { + padding: 8px; +} + +.fullwidth { + width: 100%; +} diff --git a/rpg-docs/client/views/character/features/featureDialog/featureDialog.html b/rpg-docs/client/views/character/features/featureDialog/featureDialog.html index b4923a47..1ee51cd8 100644 --- a/rpg-docs/client/views/character/features/featureDialog/featureDialog.html +++ b/rpg-docs/client/views/character/features/featureDialog/featureDialog.html @@ -32,7 +32,7 @@ {{/if}} {{#if description}} -
{{description}}
+
{{evaluateString charId description}}
{{/if}} {{> effectsViewList charId=charId parentId=_id}} diff --git a/rpg-docs/client/views/character/features/features.html b/rpg-docs/client/views/character/features/features.html index 9dbf5a84..52043f27 100644 --- a/rpg-docs/client/views/character/features/features.html +++ b/rpg-docs/client/views/character/features/features.html @@ -34,7 +34,7 @@ {{name}}
- {{damageDice}} {{{evaluateSignedSpaced ../_id damageBonus}}} {{damageType}} + {{evaluateString ../_id damage}} {{damageType}}
{{#if details}}
@@ -102,7 +102,7 @@
{{#if description}}
{{description}}
+ >{{evaluateString charId description}} {{/if}} {{#if hasUses}}
diff --git a/rpg-docs/client/views/character/inventory/containerDialog/containerDialog.html b/rpg-docs/client/views/character/inventory/containerDialog/containerDialog.html index bd0e23c6..7624418f 100644 --- a/rpg-docs/client/views/character/inventory/containerDialog/containerDialog.html +++ b/rpg-docs/client/views/character/inventory/containerDialog/containerDialog.html @@ -41,6 +41,6 @@
{{#if description}}
-
{{description}}
+
{{evaluateString charId description}}
{{/if}} diff --git a/rpg-docs/client/views/character/journal/classDialog/classDialog.js b/rpg-docs/client/views/character/journal/classDialog/classDialog.js index b234e318..09bf7afb 100644 --- a/rpg-docs/client/views/character/journal/classDialog/classDialog.js +++ b/rpg-docs/client/views/character/journal/classDialog/classDialog.js @@ -3,6 +3,9 @@ Template.classDialog.onRendered(function(){ }); Template.classDialog.events({ + "color-change": function(event, instance){ + Classes.update(instance.data.classId, {$set: {color: event.color}}); + }, "tap #deleteButton": function(event, instance){ Classes.softRemoveNode(instance.data.classId); GlobalUI.deletedToast(instance.data.classId, "Classes", "Class"); diff --git a/rpg-docs/client/views/character/journal/experienceDialog/experienceDialog.html b/rpg-docs/client/views/character/journal/experienceDialog/experienceDialog.html index 82e00e7b..577b7243 100644 --- a/rpg-docs/client/views/character/journal/experienceDialog/experienceDialog.html +++ b/rpg-docs/client/views/character/journal/experienceDialog/experienceDialog.html @@ -1,12 +1,12 @@