Merge branch 'master' into 056-items-compendium

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;
         }
     }
 }

src/scss/components/_description.scss

@@ -57,10 +57,6 @@
 }
 
 .tox {
-    .tox-editor-container {
-        background: $c-white;
-    }
-
     .tox-edit-area {
         padding: 0 8px;
     }

src/templates/actor/creature-sheet.hbs

@@ -3,7 +3,12 @@
     <header class="sheet-header">
         <img class="profile-img" src="{{actor.img}}" data-edit="img" title="{{actor.name}}" height="100" width="100" />
         <div class="header-fields flexrow">
-            <h1 class="charname"><input name="name" type="text" value="{{actor.name}}" placeholder="Name" /></h1>
+            <h1 class="charname">
+                <label for="actor.name" class="hidden">Name</label>
+                <input name="name" type="text" id="actor.name" value="{{actor.name}}" placeholder="Name" />
+            </h1>
+            {{> systems/ds4/templates/actor/partials/character-progression.hbs}}
+
             <div class="flexrow basic-properties">
                 <div class="basic-property">
                     <label>{{config.i18n.creatureBaseInfo.creatureType}}</label>
@@ -75,4 +80,4 @@
             editable=editable}}
         </div>
     </section>
-</form>
+</form>

src/templates/actor/partials/character-progression.hbs

@@ -7,6 +7,7 @@
         <input class="progression-value" type="number" name="data.combatValues.hitPoints.value"
             id="data.combatValues.hitPoints.value" value="{{data.combatValues.hitPoints.value}}" data-dtype="Number" />
     </div>
+    {{#if (eq actor.type "character")}}
     <div class="progression-entry">
         <h2 class="progression-label"><label for="data.progression.level"
                 title="{{localize 'DS4.CharacterProgressionLevel'}}">{{localize
@@ -23,4 +24,5 @@
         <input class="progression-value" type="number" name="data.progression.experiencePoints"
             id="data.progression.experiencePoints" value="{{data.progression.experiencePoints}}" data-dtype="Number" />
     </div>
+    {{/if}}
 </div>