Merge branch 'master' into fvtt-0.7.x

MustardMan42 · Jun 26, 2020 · 4e39c25 · 4e39c25
2 parents 0a2c92d + d355dbb
commit 4e39c25
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 8 deletions.
diff --git a/less/character.less b/less/character.less
@@ -26,6 +26,7 @@
       height: 20px;
       font-size: 18px;
       color: @colorTan;
+      white-space: nowrap;
     }
 
     // Experience Tracking

diff --git a/module/apps/short-rest.js b/module/apps/short-rest.js
@@ -65,7 +65,6 @@ export default class ShortRestDialog extends Dialog {
     super.activateListeners(html);
     let btn = html.find("#roll-hd");
     btn.click(this._onRollHitDie.bind(this));
-    super.activateListeners(html);
   }
 
   /* -------------------------------------------- */