From 8c5cddcd3e40fb4a3175c54f1d95c7d6047fdc9a Mon Sep 17 00:00:00 2001
From: Stas Tserkovny <stas.tserkovny@gmail.com>
Date: Fri, 26 Mar 2021 16:21:19 -0600
Subject: [PATCH] Standardize some styles between browsers

---
 module/actors/sheets/BWActorSheet.ts    |  4 +++-
 module/actors/sheets/BWSettingSheet.ts  |  1 +
 module/dialogs/CharacterBurnerDialog.ts |  2 +-
 module/dialogs/DuelOfWitsDialog.ts      |  2 +-
 module/dialogs/FightDialog.ts           |  2 +-
 module/dialogs/RangeAndCoverDialog.ts   |  2 +-
 module/items/sheets/bwItemSheet.ts      |  6 ++++++
 styles/burningwheel.scss                | 15 ++++++++++++---
 styles/dialog/difficulty.scss           |  1 +
 9 files changed, 27 insertions(+), 8 deletions(-)

diff --git a/module/actors/sheets/BWActorSheet.ts b/module/actors/sheets/BWActorSheet.ts
index 618308de..f1830024 100644
--- a/module/actors/sheets/BWActorSheet.ts
+++ b/module/actors/sheets/BWActorSheet.ts
@@ -19,7 +19,9 @@ export class BWActorSheet extends ActorSheet {
     options: ActorSheetOptions;
 
     static get defaultOptions(): ActorSheetOptions {
-        return mergeObject(super.defaultOptions, {});
+        return mergeObject(super.defaultOptions, {
+            classes:  [ "bw-app" ]
+        });
     }
 
     activateListeners(html: JQuery): void {
diff --git a/module/actors/sheets/BWSettingSheet.ts b/module/actors/sheets/BWSettingSheet.ts
index 6c0cf42c..4c2c8ef4 100644
--- a/module/actors/sheets/BWSettingSheet.ts
+++ b/module/actors/sheets/BWSettingSheet.ts
@@ -12,6 +12,7 @@ export class BWSettingSheet extends ActorSheet {
     }
     static get defaultOptions(): FormApplicationOptions {
         return mergeObject(super.defaultOptions, {
+            classes:  ["bw-app"],
             width: 600
         });
     }
diff --git a/module/dialogs/CharacterBurnerDialog.ts b/module/dialogs/CharacterBurnerDialog.ts
index f86dd627..94ae4db7 100644
--- a/module/dialogs/CharacterBurnerDialog.ts
+++ b/module/dialogs/CharacterBurnerDialog.ts
@@ -63,7 +63,7 @@ export class CharacterBurnerDialog extends Dialog {
     }
 
     static get defaultOptions(): FormApplicationOptions {
-        return mergeObject(super.defaultOptions, { width: 900, height: 800 }, { overwrite: true });
+        return mergeObject(super.defaultOptions, { width: 900, height: 800, classes: [ "bw-app" ] }, { overwrite: true });
     }
 
     getData(): CharacterBurnerData {
diff --git a/module/dialogs/DuelOfWitsDialog.ts b/module/dialogs/DuelOfWitsDialog.ts
index c227ba5e..b9f1b71c 100644
--- a/module/dialogs/DuelOfWitsDialog.ts
+++ b/module/dialogs/DuelOfWitsDialog.ts
@@ -35,7 +35,7 @@ export class DuelOfWitsDialog extends ExtendedTestDialog<DuelOfWitsData> {
     };
 
     static get defaultOptions(): FormApplicationOptions {
-        return mergeObject(super.defaultOptions, { width: 600, height: 600, resizable: true }, { overwrite: true });
+        return mergeObject(super.defaultOptions, { width: 600, height: 600, resizable: true, classes: [ "bw-app" ] }, { overwrite: true });
     }
 
     activateListeners(html: JQuery): void {
diff --git a/module/dialogs/FightDialog.ts b/module/dialogs/FightDialog.ts
index d55fed89..d1f3f5d8 100644
--- a/module/dialogs/FightDialog.ts
+++ b/module/dialogs/FightDialog.ts
@@ -215,7 +215,7 @@ export class FightDialog extends ExtendedTestDialog<FightDialogData> {
             width: 1000,
             height: 600,
             resizable: true,
-            classes: [ "fight" ]
+            classes: [ "fight", "bw-app" ]
         }, { overwrite: true });
     }
 
diff --git a/module/dialogs/RangeAndCoverDialog.ts b/module/dialogs/RangeAndCoverDialog.ts
index c3619c51..0b879574 100644
--- a/module/dialogs/RangeAndCoverDialog.ts
+++ b/module/dialogs/RangeAndCoverDialog.ts
@@ -112,7 +112,7 @@ export class RangeAndCoverDialog extends ExtendedTestDialog<RangeAndCoverData> {
             width: 1000,
             height: 600,
             resizable: true,
-            classes: [ "rnc" ]
+            classes: [ "rnc", "bw-app" ]
         }, { overwrite: true });
     }
 
diff --git a/module/items/sheets/bwItemSheet.ts b/module/items/sheets/bwItemSheet.ts
index de63f21e..2ad4f460 100644
--- a/module/items/sheets/bwItemSheet.ts
+++ b/module/items/sheets/bwItemSheet.ts
@@ -5,6 +5,12 @@ export class BWItemSheet extends ItemSheet {
         data.showImage = game.settings.get(constants.systemName, constants.settings.itemImages);
         return data;
     }
+
+    static get defaultOptions(): FormApplicationOptions {
+        return mergeObject(super.defaultOptions, {
+            classes:  ["bw-app"]
+        });
+    }
 }
 
 export interface BWItemSheetData extends ItemSheetData {
diff --git a/styles/burningwheel.scss b/styles/burningwheel.scss
index bfcf98b5..5a2fd82a 100644
--- a/styles/burningwheel.scss
+++ b/styles/burningwheel.scss
@@ -28,6 +28,10 @@
 @import "./npc/npc.scss";
 @import "./setting.scss";
 
+.bw-app > .window-content {
+    scrollbar-width: thin;
+}
+
 .subheader,
 .header {
     display: flex;
@@ -169,9 +173,14 @@ i.fas.clickable {
     }
 }
 
-textarea.note-box {
-    border: 0;
-    resize: vertical;
+textarea {
+    font-size: 13.333px;
+    scrollbar-width: thin;
+
+    &.note-box {
+        border: 0;
+        resize: vertical;
+    }
 }
 
 input.circle-input {
diff --git a/styles/dialog/difficulty.scss b/styles/dialog/difficulty.scss
index 740e35e7..1df297b7 100644
--- a/styles/dialog/difficulty.scss
+++ b/styles/dialog/difficulty.scss
@@ -92,6 +92,7 @@
     max-height: 50vh;
     overflow-y: auto;
     overflow-x: hidden;
+    scrollbar-width: thin;
 
     button {
         height: 15px;