From 9eb9d01b592f23bc62534e21d3905181ce4591e5 Mon Sep 17 00:00:00 2001 From: Johannes Loher Date: Fri, 19 Feb 2021 18:08:27 +0100 Subject: [PATCH 1/3] Add HP to creature sheet --- src/templates/actor/character-sheet.hbs | 2 +- src/templates/actor/creature-sheet.hbs | 9 +++++++-- src/templates/actor/partials/character-progression.hbs | 2 ++ 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/src/templates/actor/character-sheet.hbs b/src/templates/actor/character-sheet.hbs index 0d252d9b..d47f51fd 100644 --- a/src/templates/actor/character-sheet.hbs +++ b/src/templates/actor/character-sheet.hbs @@ -5,7 +5,7 @@ height="100" width="100" />

- +

{{> systems/ds4/templates/actor/partials/character-progression.hbs}} diff --git a/src/templates/actor/creature-sheet.hbs b/src/templates/actor/creature-sheet.hbs index c34a142d..8b32ca3b 100644 --- a/src/templates/actor/creature-sheet.hbs +++ b/src/templates/actor/creature-sheet.hbs @@ -3,7 +3,12 @@
-

+

+ + +

+ {{> systems/ds4/templates/actor/partials/character-progression.hbs}} +
@@ -75,4 +80,4 @@ editable=editable}}
- \ No newline at end of file + diff --git a/src/templates/actor/partials/character-progression.hbs b/src/templates/actor/partials/character-progression.hbs index bbcf5e4e..4bd06898 100644 --- a/src/templates/actor/partials/character-progression.hbs +++ b/src/templates/actor/partials/character-progression.hbs @@ -7,6 +7,7 @@
+ {{#if (eq actor.type "character")}}

+ {{/if}}
From 2a10bfacdb3f756fc2326c0a97c6cce65d5b9eeb Mon Sep 17 00:00:00 2001 From: Johannes Loher Date: Fri, 19 Feb 2021 18:10:26 +0100 Subject: [PATCH 2/3] Fixup --- src/templates/actor/character-sheet.hbs | 2 +- src/templates/actor/creature-sheet.hbs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/templates/actor/character-sheet.hbs b/src/templates/actor/character-sheet.hbs index d47f51fd..0d252d9b 100644 --- a/src/templates/actor/character-sheet.hbs +++ b/src/templates/actor/character-sheet.hbs @@ -5,7 +5,7 @@ height="100" width="100" />

- +

{{> systems/ds4/templates/actor/partials/character-progression.hbs}} diff --git a/src/templates/actor/creature-sheet.hbs b/src/templates/actor/creature-sheet.hbs index 8b32ca3b..12384205 100644 --- a/src/templates/actor/creature-sheet.hbs +++ b/src/templates/actor/creature-sheet.hbs @@ -5,7 +5,7 @@

- +

{{> systems/ds4/templates/actor/partials/character-progression.hbs}} From 622253f0da99ae5677e8017875a86f302a6fad1a Mon Sep 17 00:00:00 2001 From: Johannes Loher Date: Sat, 20 Feb 2021 01:46:40 +0100 Subject: [PATCH 3/3] Make some small improvements in actor sheets --- src/scss/components/_apps.scss | 4 ++-- src/scss/components/_description.scss | 4 ---- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/src/scss/components/_apps.scss b/src/scss/components/_apps.scss index f305ef33..878f83ed 100644 --- a/src/scss/components/_apps.scss +++ b/src/scss/components/_apps.scss @@ -12,10 +12,10 @@ } .tab { height: 100%; - overflow-y: visible; + overflow-y: auto; align-content: flex-start; ol { - overflow-y: visible; + overflow-y: auto; } } } diff --git a/src/scss/components/_description.scss b/src/scss/components/_description.scss index b1291504..7afaf399 100644 --- a/src/scss/components/_description.scss +++ b/src/scss/components/_description.scss @@ -57,10 +57,6 @@ } .tox { - .tox-editor-container { - background: $c-white; - } - .tox-edit-area { padding: 0 8px; }