From 584eb59e5642d8dcab6a3a9ae2adfc5d56ffeb4f Mon Sep 17 00:00:00 2001 From: TheLastScrub <67403321+TheLastScrub@users.noreply.github.com> Date: Tue, 1 Jun 2021 20:44:39 -0700 Subject: [PATCH] final base 0.8.x changes --- css/deltagreen.css | 7 ++++--- css/editor.css | 37 +++++++++++++++++++++++++++++++++++++ module/actor/actor-sheet.js | 6 ++++++ module/deltagreen.js | 15 --------------- module/roll/roll.js | 13 ++++++++++++- 5 files changed, 59 insertions(+), 19 deletions(-) create mode 100644 css/editor.css diff --git a/css/deltagreen.css b/css/deltagreen.css index 82fc52d..bad8e68 100644 --- a/css/deltagreen.css +++ b/css/deltagreen.css @@ -599,11 +599,12 @@ div.motivation-editor-container div.editor{ } .editor-host .tox .tox-editor-container { - background: url("../assets/img/old_paper.jpg") !important; + background: none !important; } -.deltagreen .tox .tox-editor-container { - background: #fff; + +.deltagreen .tox-editor-header { + background: none !important; } .deltagreen .tox .tox-edit-area { diff --git a/css/editor.css b/css/editor.css new file mode 100644 index 0000000..40edb80 --- /dev/null +++ b/css/editor.css @@ -0,0 +1,37 @@ +@font-face { + font-family: 'SpecialElite'; + src: url('../assets/font/special_elite/SpecialElite-Regular.ttf') format('truetype'); /* Chrome 4+, Firefox 3.5, Opera 10+, Safari 3—5 */ +} + +.special-elite-font{ + font-family: "SpecialElite", sans-serif !important; +} + +.editor-content { + font-family: "SpecialElite", sans-serif !important; +} + + + .tox .tox-editor-container { + font-family: "SpecialElite", sans-serif !important; + } + + .tox .tox-edit-area { + font-family: "SpecialElite", sans-serif !important; + } + + .editor-host .editor { + font-family: "SpecialElite", sans-serif !important; + } + + .editor-host .tox { + font-family: "SpecialElite", sans-serif !important; + } + + .editor-host .tox-tinymce { + font-family: "SpecialElite", sans-serif !important; + } + + .editor-host .tox .tox-edit-area { + font-family: "SpecialElite", sans-serif !important; + } \ No newline at end of file diff --git a/module/actor/actor-sheet.js b/module/actor/actor-sheet.js index ce7f9d9..7e22d1a 100644 --- a/module/actor/actor-sheet.js +++ b/module/actor/actor-sheet.js @@ -439,4 +439,10 @@ export class DeltaGreenActorSheet extends ActorSheet { // Set data transfer event.dataTransfer.setData("text/plain", JSON.stringify(dragData)); } + + activateEditor(target, editorOptions, initialContent) { + editorOptions.content_css = "./systems/deltagreen/css/editor.css"; + return super.activateEditor(target, editorOptions, initialContent); + }; } + diff --git a/module/deltagreen.js b/module/deltagreen.js index 2925174..37afff9 100644 --- a/module/deltagreen.js +++ b/module/deltagreen.js @@ -161,28 +161,13 @@ Hooks.on("ready", ()=> { if(backgroundImageSetting === "OldPaper1"){ customCss += `section.window-content{ background: url("systems/deltagreen/assets/img/old_paper.jpg") !important; - } - .editor-host .tox .tox-editor-container { - background: url("../assets/img/old_paper.jpg") !important; - font-family: "SpecialElite", sans-serif !important; }`; } else if(backgroundImageSetting === "IvoryPaper"){ customCss += `section.window-content{ - background: url("systems/deltagreen/assets/img/ivory-off-white-paper-texture.jpg") !important; background-size: 100% !important; - } - .editor-host .tox .tox-editor-container { - background: url("systems/deltagreen/assets/img/ivory-off-white-paper-texture.jpg") !important; - background-size: 100% !important; }`; } - else{ - customCss += `.editor-host .tox .tox-editor-container { - background: url("/ui/parchment.jpg") !important; - background-size: 100% !important; - }`; - } customStyle.innerHTML = customCss; diff --git a/module/roll/roll.js b/module/roll/roll.js index 897fa14..2706166 100644 --- a/module/roll/roll.js +++ b/module/roll/roll.js @@ -358,4 +358,15 @@ export function skillIsStatTest(skillName){ catch(ex){ return false; } -} \ No newline at end of file +} + +/* rollMode Options -> CONFIG.Dice.rollModes + + game.i18n.localize("CHAT.RollBlind") -> "Blind GM Roll" + {{selectOptions rollModes selected=defaultRollMode localize=true}} + + roll -> 'Public Roll' + gmroll -> 'Private GM Roll' + blindroll -> 'Blind GM Roll' + selfroll -> 'Self Roll' + */ \ No newline at end of file