Skip to content

Commit

Permalink
Standardize some styles between browsers
Browse files Browse the repository at this point in the history
  • Loading branch information
StasTserk committed Mar 26, 2021
1 parent a5689b9 commit 8c5cddc
Show file tree
Hide file tree
Showing 9 changed files with 27 additions and 8 deletions.
4 changes: 3 additions & 1 deletion module/actors/sheets/BWActorSheet.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
1 change: 1 addition & 0 deletions module/actors/sheets/BWSettingSheet.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ export class BWSettingSheet extends ActorSheet {
}
static get defaultOptions(): FormApplicationOptions {
return mergeObject(super.defaultOptions, {
classes: ["bw-app"],
width: 600
});
}
Expand Down
2 changes: 1 addition & 1 deletion module/dialogs/CharacterBurnerDialog.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion module/dialogs/DuelOfWitsDialog.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion module/dialogs/FightDialog.ts
Original file line number Diff line number Diff line change
Expand Up @@ -215,7 +215,7 @@ export class FightDialog extends ExtendedTestDialog<FightDialogData> {
width: 1000,
height: 600,
resizable: true,
classes: [ "fight" ]
classes: [ "fight", "bw-app" ]
}, { overwrite: true });
}

Expand Down
2 changes: 1 addition & 1 deletion module/dialogs/RangeAndCoverDialog.ts
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ export class RangeAndCoverDialog extends ExtendedTestDialog<RangeAndCoverData> {
width: 1000,
height: 600,
resizable: true,
classes: [ "rnc" ]
classes: [ "rnc", "bw-app" ]
}, { overwrite: true });
}

Expand Down
6 changes: 6 additions & 0 deletions module/items/sheets/bwItemSheet.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
15 changes: 12 additions & 3 deletions styles/burningwheel.scss
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,10 @@
@import "./npc/npc.scss";
@import "./setting.scss";

.bw-app > .window-content {
scrollbar-width: thin;
}

.subheader,
.header {
display: flex;
Expand Down Expand Up @@ -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 {
Expand Down
1 change: 1 addition & 0 deletions styles/dialog/difficulty.scss
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,7 @@
max-height: 50vh;
overflow-y: auto;
overflow-x: hidden;
scrollbar-width: thin;

button {
height: 15px;
Expand Down

0 comments on commit 8c5cddc

Please sign in to comment.